Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a3040b7 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Clean up the keepalive slots when network disconnect" am:...

Merge "Merge "Clean up the keepalive slots when network disconnect" am: 8e63c9cc am: 0dd9daed" into qt-dev-plus-aosp
parents 0c9523f1 a5f6bd16
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -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) {