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

Commit 9916a63b authored by Junyu Lai's avatar Junyu Lai Committed by Gerrit Code Review
Browse files

Merge "Fix concurrent modification exception in KeepaliveTracker"

parents ce5ecd93 cf43dbdb

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

+3 −2
Original line number Diff line number Diff line
@@ -462,9 +462,10 @@ public class KeepaliveTracker { 
    }



    public void handleStopAllKeepalives(NetworkAgentInfo nai, int reason) {

        HashMap <Integer, KeepaliveInfo> networkKeepalives = mKeepalives.get(nai);

        final HashMap<Integer, KeepaliveInfo> networkKeepalives = mKeepalives.get(nai);

        if (networkKeepalives != null) {

            for (KeepaliveInfo ki : networkKeepalives.values()) {

            final ArrayList<KeepaliveInfo> kalist = new ArrayList(networkKeepalives.values());

            for (KeepaliveInfo ki : kalist) {

                ki.stop(reason);

                // Clean up keepalives since the network agent is disconnected and unable to pass

                // back asynchronous result of stop().