Merge "Clean up the keepalive slots when network disconnect"

This commit is contained in:
Junyu Lai
2019-05-09 18:53:03 +00:00
committed by Gerrit Code Review

View File

@@ -496,10 +496,11 @@ public class KeepaliveTracker {
if (networkKeepalives != null) { if (networkKeepalives != null) {
for (KeepaliveInfo ki : networkKeepalives.values()) { for (KeepaliveInfo ki : networkKeepalives.values()) {
ki.stop(reason); ki.stop(reason);
// Clean up keepalives since the network agent is disconnected and unable to pass
// back asynchronous result of stop().
cleanupStoppedKeepalive(nai, ki.mSlot);
} }
} }
// Clean up keepalives will be done as a result of calling ki.stop() after the slots are
// freed.
} }
public void handleStopKeepalive(NetworkAgentInfo nai, int slot, int reason) { public void handleStopKeepalive(NetworkAgentInfo nai, int slot, int reason) {