commit 7da0d7f02eb2f14ed865ae89519e3b6bc1b6d619
author Junyu Lai <junyulai@google.com> Mon May 13 10:09:48 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 13 10:09:48 2019 +0000
tree f9ed80c97a6b2476e247a69f31d5b718cdad6d37
parent cc8d6dd0bb92d7c0fa4a85f0b4e3c4502fb715be
parent 6e2c653c6eb68464e386799c6f05710db39826c7

Merge "Fix concurrent modification exception in KeepaliveTracker"

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

diff --git a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java
index 526b4ff..e10d737 100644
--- a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java
+++ b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java
@@ -462,9 +462,10 @@
     }
 
     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().