From 91456a8c7abed3fb5cc9dba438a361019f4782c5 Mon Sep 17 00:00:00 2001
From: Chalard Jean <jchalard@google.com>
Date: Wed, 2 May 2018 21:36:12 +0900
Subject: [PATCH] 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
---
 .../android/server/ethernet/EthernetNetworkFactory.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
index e3f114ed21..3cda13f330 100644
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/service-t/src/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();