Merge "handle wifi interface changes with interfaceRemoved" into nyc-dev (602123a1) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -255,6 +255,9 @@ public class Tethering extends BaseNetworkObserver {
	// ignore usb0 down after enabling RNDIS		// ignore usb0 down after enabling RNDIS
	// we will handle disconnect in interfaceRemoved instead		// we will handle disconnect in interfaceRemoved instead
	if (VDBG) Log.d(TAG, "ignore interface down for " + iface);		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) {		} else if (sm != null) {
	sm.sendMessage(TetherInterfaceSM.CMD_INTERFACE_DOWN);		sm.sendMessage(TetherInterfaceSM.CMD_INTERFACE_DOWN);
	mIfaces.remove(iface);		mIfaces.remove(iface);