commit d77e1723a14dc0c2008c8f0481d2d3d756ac74c3
author tank.hung <tank.hung@mediatek.com> Tue May 14 09:42:35 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 14 09:42:35 2019 -0700
tree e4c3cbdac61b58661744c4c854054d7a0e6c8a3f
parent 4cb1ed3573a2b70332e2f4a2031cf6b581ddba8f
parent a1e229d9d46abfe9672fce04c141787670038396

Merge "Add reconnect flow when updateIPConfiguration"
am: a1e229d9d4

Change-Id: Iad395c171db5f186859c485e8d929a6e577f3c5f

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 b8ed845..6ed1310 100644
--- a/java/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -376,7 +376,14 @@
         }
 
         void setIpConfig(IpConfiguration ipConfig) {
+            if (this.mIpConfig.equals(ipConfig)) {
+                if (DBG) Log.d(TAG, "ipConfig have not changed,so ignore setIpConfig");
+                return;
+            }
             this.mIpConfig = ipConfig;
+            if (mNetworkInfo.getDetailedState() != DetailedState.DISCONNECTED) {
+                restart();
+            }
         }
 
         boolean statisified(NetworkCapabilities requestedCapabilities) {
@@ -587,6 +594,12 @@
             }
         }
 
+        void restart(){
+            if (DBG) Log.d(TAG, "reconnecting Etherent");
+            stop();
+            start();
+        }
+
         @Override
         public String toString() {
             return getClass().getSimpleName() + "{ "