LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix concurrent modification exception in KeepaliveTracker" am: 7da0d7f02e

Browse Source 
am: 5fb8a1d525

Change-Id: I6221bdff630ebef88bfd9d609e31a0f9ede036ad
This commit is contained in:
Junyu Lai
2019-05-13 03:52:25 -07:00
committed by android-build-merger
parent 6e95d70fae 5fb8a1d525
commit 029da6e8f7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/connectivity/KeepaliveTracker.java
View File

@@ -462,9 +462,10 @@ public class KeepaliveTracker {
} }
public void handleStopAllKeepalives(NetworkAgentInfo nai, int reason) { 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) { if (networkKeepalives != null) {
for (KeepaliveInfo ki : networkKeepalives.values()) { final ArrayList<KeepaliveInfo> kalist = new ArrayList(networkKeepalives.values());
for (KeepaliveInfo ki : kalist) {
ki.stop(reason); ki.stop(reason);
// Clean up keepalives since the network agent is disconnected and unable to pass // Clean up keepalives since the network agent is disconnected and unable to pass
// back asynchronous result of stop(). // back asynchronous result of stop().