Merge "Merge "Clean up the keepalive slots when network disconnect" am: 192f09d63e am: 56001c90c8" into qt-dev-plus-aosp

am: 4a3040b776 Change-Id: Icb5a1b5bb10617aa5a7b35db6cf48db3dc53b7fd
2019-05-09 15:56:10 -07:00
parent 3ec07e51a9 6f9be90965
commit 5b21515a81
1 changed files with 3 additions and 2 deletions
--- a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java
+++ b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java
@@ -496,10 +496,11 @@ public class KeepaliveTracker {
        if (networkKeepalives != null) {
            for (KeepaliveInfo ki : networkKeepalives.values()) {
                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) {