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 am: 408c4cca3d

Browse Source 
Change-Id: Ia2399d7e838b762deac7c09972a1d25d85c3a1e5
This commit is contained in:
TreeHugger Robot
2020-03-19 20:18:49 +00:00
committed by Automerger Merge Worker
parent 69871940cf 408c4cca3d
commit fab1119113
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);
} 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);
stopTrackingInterfaceLocked(mConfiguredEthernetIface);
mConfiguredEthernetIface = null;
if (mConfiguredEthernetIface != null) {
stopTrackingInterfaceLocked(mConfiguredEthernetIface);
mConfiguredEthernetIface = null;
}
if (mEthernetCallback != null) {
mEthernetIfaceRequest.release();
mEthernetCallback = null;
mEthernetIfaceRequest = null;
}
}
private class EthernetCallback implements EthernetManager.TetheredInterfaceCallback {