diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-03-09 22:43:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-09 22:43:46 +0000 |
| commit | 70f8f650c147a0e3d8a075c5e7ce473b4ee708aa (patch) | |
| tree | 1f1197da033ade6dc7cb0d970f0d6129f1d967f7 | |
| parent | b1b56269d5e01eea2c9927e28007e4c989c8deb8 (diff) | |
| parent | 81e211e19f28f9aea084e42cb2f4a42a8158a67c (diff) | |
| download | ethernet-70f8f650c147a0e3d8a075c5e7ce473b4ee708aa.tar.gz | |
Merge "Rename StringNetworkSpecifier to Ethernet" into sc-dev
| -rw-r--r-- | java/com/android/server/ethernet/EthernetNetworkFactory.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java index b9ebf89..dba152c 100644 --- a/java/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java @@ -23,6 +23,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; import android.net.ConnectivityManager; +import android.net.EthernetNetworkSpecifier; import android.net.IpConfiguration; import android.net.IpConfiguration.IpAssignment; import android.net.IpConfiguration.ProxySettings; @@ -33,7 +34,6 @@ import android.net.NetworkCapabilities; import android.net.NetworkFactory; import android.net.NetworkRequest; import android.net.NetworkSpecifier; -import android.net.StringNetworkSpecifier; import android.net.ip.IIpClient; import android.net.ip.IpClientCallbacks; import android.net.ip.IpClientUtil; @@ -219,8 +219,9 @@ public class EthernetNetworkFactory extends NetworkFactory { String requestedIface = null; NetworkSpecifier specifier = request.getNetworkSpecifier(); - if (specifier instanceof StringNetworkSpecifier) { - requestedIface = ((StringNetworkSpecifier) specifier).specifier; + if (specifier instanceof EthernetNetworkSpecifier) { + requestedIface = ((EthernetNetworkSpecifier) specifier) + .getInterfaceName(); } NetworkInterfaceState network = null; |