summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/location/NanoAppStateManager.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/location/NanoAppStateManager.java b/services/core/java/com/android/server/location/NanoAppStateManager.java
index 81c47849c3ad..98696265c209 100644
--- a/services/core/java/com/android/server/location/NanoAppStateManager.java
+++ b/services/core/java/com/android/server/location/NanoAppStateManager.java
@@ -24,6 +24,7 @@ import android.util.Log;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
/**
@@ -153,11 +154,12 @@ import java.util.List;
nanoAppIdSet.add(appInfo.appId);
}
- for (int nanoAppHandle : mNanoAppHash.keySet()) {
- NanoAppInstanceInfo info = mNanoAppHash.get(nanoAppHandle);
+ Iterator<NanoAppInstanceInfo> iterator = mNanoAppHash.values().iterator();
+ while (iterator.hasNext()) {
+ NanoAppInstanceInfo info = iterator.next();
if (info.getContexthubId() == contextHubId &&
!nanoAppIdSet.contains(info.getAppId())) {
- mNanoAppHash.remove(nanoAppHandle);
+ iterator.remove();
}
}
}