LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Rename StringNetworkSpecifier to Ethernet" am: ddbc35510e am: bdec8758a9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1574261

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa8fc1fa7c6a8f4d54036a5c6d14f04d8b75fe71
This commit is contained in:
Remi NGUYEN VAN
2021-03-12 00:26:45 +00:00
committed by Automerger Merge Worker
parent 9b8d02047b bdec8758a9
commit 823bab6c17
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
View File

@@ -23,6 +23,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.EthernetNetworkSpecifier;
import android.net.IpConfiguration; import android.net.IpConfiguration;
import android.net.IpConfiguration.IpAssignment; import android.net.IpConfiguration.IpAssignment;
import android.net.IpConfiguration.ProxySettings; import android.net.IpConfiguration.ProxySettings;
@@ -33,7 +34,6 @@ import android.net.NetworkCapabilities;
import android.net.NetworkFactory; import android.net.NetworkFactory;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.net.NetworkSpecifier; import android.net.NetworkSpecifier;
import android.net.StringNetworkSpecifier;
import android.net.ip.IIpClient; import android.net.ip.IIpClient;
import android.net.ip.IpClientCallbacks; import android.net.ip.IpClientCallbacks;
import android.net.ip.IpClientUtil; import android.net.ip.IpClientUtil;
@@ -215,8 +215,9 @@ public class EthernetNetworkFactory extends NetworkFactory {
String requestedIface = null; String requestedIface = null;
NetworkSpecifier specifier = request.getNetworkSpecifier(); NetworkSpecifier specifier = request.getNetworkSpecifier();
if (specifier instanceof StringNetworkSpecifier) { if (specifier instanceof EthernetNetworkSpecifier) {
requestedIface = ((StringNetworkSpecifier) specifier).specifier; requestedIface = ((EthernetNetworkSpecifier) specifier)
.getInterfaceName();
} }
NetworkInterfaceState network = null; NetworkInterfaceState network = null;