diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-02-04 16:36:24 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2021-03-10 09:20:39 +0900 |
| commit | 2322cc98a91395a18b19346d527c9cfb8742fd1b (patch) | |
| tree | d301be5257d335aed39812513f1dce1d9e7866ee | |
| parent | 02bdbdde293f41166c56839eb10770d543601303 (diff) | |
| download | ethernet-2322cc98a91395a18b19346d527c9cfb8742fd1b.tar.gz | |
Rename StringNetworkSpecifier to Ethernet
The new specifier represents ethernet interfaces more
specifically and is part of the public API.
Bug: 179329291
Test: atest CtsNetTestCases
Merged-In: I6cba1709b3007a22d95849a1281237c77e1464a4
Change-Id: I6cba1709b3007a22d95849a1281237c77e1464a4
| -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; |