Merge "Merge "Memory leak due to no stop for IpNeighborMonitor." am: 4cc7532355 am: 1e488831bd" into rvc-dev-plus-aosp am: 6a952e4f88

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343440

Change-Id: I14876fb85a36c34b62429c509389da1e0aa5e984
This commit is contained in:
Automerger Merge Worker
2020-06-18 16:49:19 +00:00

View File

@@ -1321,6 +1321,7 @@ public class IpServer extends StateMachine {
class UnavailableState extends State { class UnavailableState extends State {
@Override @Override
public void enter() { public void enter() {
mIpNeighborMonitor.stop();
mLastError = TetheringManager.TETHER_ERROR_NO_ERROR; mLastError = TetheringManager.TETHER_ERROR_NO_ERROR;
sendInterfaceState(STATE_UNAVAILABLE); sendInterfaceState(STATE_UNAVAILABLE);
} }