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

Commit a5f6bd16 authored by Junyu Lai's avatar Junyu Lai Committed by android-build-merger
Browse files

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

am: 0dd9daed

Change-Id: Id3e4e159713c0ed7e03f45169e87b73ae6408e4f
parents 8ea082a3 0dd9daed

services/core/java/com/android/server/connectivity/KeepaliveTracker.java

+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) {