Merge "Always note the state of RNDIS from USB broadcasts." into oc-dr1-dev am: 07df171ac6 (83c2bd5d) · Commits · e / os / android_frameworks_base

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

+9 −6

Original line number	Diff line number	Diff line
		@@ -832,20 +832,23 @@ public class Tethering extends BaseNetworkObserver {
		// functions are ready to use.
		//
		// For more explanation, see b/62552150 .
		synchronized (Tethering.this.mPublicSync) {
		// Always record the state of RNDIS.
		mRndisEnabled = rndisEnabled;

		if (usbConnected && !usbConfigured) {
		// Nothing for us to do here.
		// TODO: consider ignoring DISCONNECTED broadcasts as well.
		// Nothing to do here (only CONNECTED, not yet CONFIGURED).
		return;
		}

		synchronized (Tethering.this.mPublicSync) {
		mRndisEnabled = rndisEnabled;
		// start tethering if we have a request pending
		if (usbConfigured && mRndisEnabled && mUsbTetherRequested) {
		tetherMatchingInterfaces(
		IControlsTethering.STATE_TETHERED,
		ConnectivityManager.TETHERING_USB);
		}

		// TODO: Figure out how to remove the need for this variable.
		mUsbTetherRequested = false;
		}
		}