am 74d270d1: Clear all Ethernet state when our interface goes away.

* commit '74d270d167ed6c3a6fa28e426da80d51a44a2af0':
  Clear all Ethernet state when our interface goes away.

1 files changed, 6 insertions, 1 deletions

diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java
index a471154..2d0a957 100644
--- a/java/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -208,13 +208,18 @@ class EthernetNetworkFactory {
             return;
 
         Log.d(TAG, "Stopped tracking interface " + iface);
+        // TODO: Unify this codepath with stop().
         synchronized (this) {
+            NetworkUtils.stopDhcp(mIface);
             mIface = "";
             mHwAddr = null;
             mNetworkInfo.setExtraInfo(null);
+            mLinkUp = false;
+            mNetworkInfo.setDetailedState(DetailedState.DISCONNECTED, null, mHwAddr);
+            updateAgent();
+            mNetworkAgent = null;
             mNetworkInfo = new NetworkInfo(ConnectivityManager.TYPE_ETHERNET, 0, NETWORK_TYPE, "");
             mLinkProperties = new LinkProperties();
-            updateAgent();
         }
     }