commit 602123a14ac316fe0d08a9417f3d38f7d566c83b
author Rebecca Silberstein <silberst@google.com> Wed Mar 23 20:41:05 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 23 20:41:06 2016 +0000
tree 6e47d925e06526736a5636e8e5303e068f2e73f6
parent 6e379cddbcf658cf177e4adf44046c836f543772
parent 908c5df3b16aa6a3d0e2fd8409720a8c966e098d

Merge "handle wifi interface changes with interfaceRemoved" into nyc-dev

services/core/java/com/android/server/connectivity/Tethering.java

diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index 4eecc81..da9c48a 100644
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -255,6 +255,9 @@
                     // ignore usb0 down after enabling RNDIS
                     // we will handle disconnect in interfaceRemoved instead
                     if (VDBG) Log.d(TAG, "ignore interface down for " + iface);
+                } else if (isWifi(iface)) {
+                    // handle disconnect in interfaceRemoved
+                    if (VDBG) Log.d(TAG, "ignore interface down for " + iface);
                 } else if (sm != null) {
                     sm.sendMessage(TetherInterfaceSM.CMD_INTERFACE_DOWN);
                     mIfaces.remove(iface);