diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2014-10-02 02:00:12 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 02:00:12 +0000 |
commit | a633d8417b4518d951c295d55996f6eb43546327 (patch) | |
tree | da0aed76efa269c11fbd973ea8379cee90c50d39 | |
parent | 561243aa75eb62a4845ddd55039ea9c565bf6c63 (diff) | |
parent | 74d270d167ed6c3a6fa28e426da80d51a44a2af0 (diff) | |
download | android_frameworks_opt_net_ethernet-a633d8417b4518d951c295d55996f6eb43546327.tar.gz android_frameworks_opt_net_ethernet-a633d8417b4518d951c295d55996f6eb43546327.tar.bz2 android_frameworks_opt_net_ethernet-a633d8417b4518d951c295d55996f6eb43546327.zip |
am 74d270d1: Clear all Ethernet state when our interface goes away.
* commit '74d270d167ed6c3a6fa28e426da80d51a44a2af0':
Clear all Ethernet state when our interface goes away.
-rw-r--r-- | java/com/android/server/ethernet/EthernetNetworkFactory.java | 7 |
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(); } } |