Merge "Release the interface request when Ethernet tethering is stopped." into rvc-dev (e8d1d95a) · Commits · e / os / android_frameworks_base

packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -641,22 +641,22 @@ public class Tethering {
		mEthernetIfaceRequest = em.requestTetheredInterface(mExecutor, mEthernetCallback);
		} else {
		stopEthernetTetheringLocked();
		if (mEthernetCallback != null) {
		mEthernetIfaceRequest.release();
		mEthernetCallback = null;
		mEthernetIfaceRequest = null;
		}
		}
		}
		return TETHER_ERROR_NO_ERROR;
		}

		private void stopEthernetTetheringLocked() {
		if (mConfiguredEthernetIface == null) return;
		changeInterfaceState(mConfiguredEthernetIface, IpServer.STATE_AVAILABLE);
		if (mConfiguredEthernetIface != null) {
		stopTrackingInterfaceLocked(mConfiguredEthernetIface);
		mConfiguredEthernetIface = null;
		}
		if (mEthernetCallback != null) {
		mEthernetIfaceRequest.release();
		mEthernetCallback = null;
		mEthernetIfaceRequest = null;
		}
		}

		private class EthernetCallback implements EthernetManager.TetheredInterfaceCallback {
		@Override