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

Commit 67567fb7 authored by Junyu Lai's avatar Junyu Lai Committed by android-build-merger
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
am: 4a3040b7

Change-Id: Icb5a1b5bb10617aa5a7b35db6cf48db3dc53b7fd
parents 37af317d 4a3040b7

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