LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Clean up the keepalive slots when network disconnect"

Browse Source 
am: 192f09d63e

Change-Id: I2cedf5752d37f96337ab69d94534cb7745e8efa3
This commit is contained in:
Junyu Lai
2019-05-09 12:29:16 -07:00
committed by android-build-merger
parent 042800ead0 192f09d63e
commit 56001c90c8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/connectivity/KeepaliveTracker.java
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) {