Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Release the interface request when Ethernet tethering is stopped." into rvc-dev am: e8d1d95abd am: ffa0666eed

Browse Source 
Change-Id: I244c3512c76e5c5d5a1d10415c7e89075875c253
This commit is contained in:
TreeHugger Robot
2020-03-19 19:43:25 +00:00
committed by Automerger Merge Worker
parent 24191e731f ffa0666eed
commit 408c4cca3d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
View File

@@ -641,21 +641,21 @@ public class Tethering {
mEthernetIfaceRequest = em.requestTetheredInterface(mExecutor, mEthernetCallback); mEthernetIfaceRequest = em.requestTetheredInterface(mExecutor, mEthernetCallback);
} else { } else {
stopEthernetTetheringLocked(); stopEthernetTetheringLocked();
if (mEthernetCallback != null) {
mEthernetIfaceRequest.release();
mEthernetCallback = null;
mEthernetIfaceRequest = null;
}
} }
} }
return TETHER_ERROR_NO_ERROR; return TETHER_ERROR_NO_ERROR;
} }
private void stopEthernetTetheringLocked() { private void stopEthernetTetheringLocked() {
if (mConfiguredEthernetIface == null) return; if (mConfiguredEthernetIface != null) {
changeInterfaceState(mConfiguredEthernetIface, IpServer.STATE_AVAILABLE); stopTrackingInterfaceLocked(mConfiguredEthernetIface);
stopTrackingInterfaceLocked(mConfiguredEthernetIface); mConfiguredEthernetIface = null;
mConfiguredEthernetIface = null; }
if (mEthernetCallback != null) {
mEthernetIfaceRequest.release();
mEthernetCallback = null;
mEthernetIfaceRequest = null;
}
} }
private class EthernetCallback implements EthernetManager.TetheredInterfaceCallback { private class EthernetCallback implements EthernetManager.TetheredInterfaceCallback {