commit 6226dd45b42183ea53ff751e7de7ea333aebde54
author Chalard Jean <jchalard@google.com> Wed Sep 18 05:27:47 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 18 05:27:47 2019 -0700
tree c0ef60e6aba7b7b7836773a24b61171d1b68cc1b
parent f93994f75d0dab9e182012964686c96f754b1c0c
parent 236475f0b4cacc4460d1d873de9a96ccb4a417f0

Update Ethernet code for the NetworkFactory serial number. am: 70b8312970 am: 773c58ad19
am: 236475f0b4

Change-Id: Ifcce756f31fc85bcba49731596a8fc270efc3c79

java/com/android/server/ethernet/EthernetNetworkFactory.java

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 @@
         }
 
         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 @@
         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 @@
         }
 
         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 @@
             // 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();