diff options
author | Chalard Jean <jchalard@google.com> | 2018-05-02 21:36:12 +0900 |
---|---|---|
committer | Aaron Huang <huangaaron@google.com> | 2019-09-09 11:03:51 +0800 |
commit | 70b8312970445a3a8c0514c051136c00191c9daa (patch) | |
tree | c0ef60e6aba7b7b7836773a24b61171d1b68cc1b | |
parent | f430bfa57ca181ff6ebacd3faf95007d96f8ddec (diff) | |
download | ethernet-70b8312970445a3a8c0514c051136c00191c9daa.tar.gz |
Update Ethernet code for the NetworkFactory serial number.
See aosp/708790
Bug: 18637384
Bug: 29030667
Test: manual
cts
runtest framework-net
atest frameworks/opt/net/ethernet/tests
Change-Id: I5caa4cb89ca1441f3c84b5675ceede6ecacfd132
-rw-r--r-- | java/com/android/server/ethernet/EthernetNetworkFactory.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java index e3f114e..3cda13f 100644 --- a/java/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java @@ -157,7 +157,7 @@ public class EthernetNetworkFactory extends NetworkFactory { } NetworkInterfaceState iface = new NetworkInterfaceState( - ifaceName, hwAddress, mHandler, mContext, capabilities); + ifaceName, hwAddress, mHandler, mContext, capabilities, this); iface.setIpConfig(ipConfiguration); mTrackingInterfaces.put(ifaceName, iface); @@ -248,6 +248,7 @@ public class EthernetNetworkFactory extends NetworkFactory { private final Handler mHandler; private final Context mContext; private final NetworkInfo mNetworkInfo; + private final NetworkFactory mNetworkFactory; private static String sTcpBufferSizes = null; // Lazy initialized. @@ -356,13 +357,15 @@ public class EthernetNetworkFactory extends NetworkFactory { } NetworkInterfaceState(String ifaceName, String hwAddress, Handler handler, Context context, - @NonNull NetworkCapabilities capabilities) { + @NonNull NetworkCapabilities capabilities, NetworkFactory networkFactory) { name = ifaceName; mCapabilities = checkNotNull(capabilities); mHandler = handler; mContext = context; + mNetworkFactory = networkFactory; int legacyType = ConnectivityManager.TYPE_NONE; int[] transportTypes = mCapabilities.getTransportTypes(); + if (transportTypes.length > 0) { legacyType = getLegacyType(transportTypes[0]); } else { @@ -471,7 +474,7 @@ public class EthernetNetworkFactory extends NetworkFactory { // Create our NetworkAgent. mNetworkAgent = new NetworkAgent(mHandler.getLooper(), mContext, NETWORK_TYPE, mNetworkInfo, mCapabilities, mLinkProperties, - getNetworkScore()) { + getNetworkScore(), mNetworkFactory.getSerialNumber()) { public void unwanted() { if (this == mNetworkAgent) { stop(); |