am c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
* commit 'c74500f44e3673b7728c2f619ee3d61a73ad5526':
Fix NPE due to missing ProcessItem.mPackageInfo
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index dbe4a64..4f2c115 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -756,6 +756,7 @@
}
// Look for services and their primary processes that no longer exist...
+ ArrayList<Integer> uidToDelete = null;
for (int i=0; i<mServiceProcessesByName.size(); i++) {
HashMap<String, ProcessItem> procs = mServiceProcessesByName.valueAt(i);
Iterator<ProcessItem> pit = procs.values().iterator();
@@ -772,7 +773,10 @@
changed = true;
pit.remove();
if (procs.size() == 0) {
- mServiceProcessesByName.remove(mServiceProcessesByName.keyAt(i));
+ if (uidToDelete == null) {
+ uidToDelete = new ArrayList<Integer>();
+ }
+ uidToDelete.add(mServiceProcessesByName.keyAt(i));
}
if (pi.mPid != 0) {
mServiceProcessesByPid.remove(pi.mPid);
@@ -790,6 +794,13 @@
}
}
+ if (uidToDelete != null) {
+ for (int i = 0; i < uidToDelete.size(); i++) {
+ int uid = uidToDelete.get(i);
+ mServiceProcessesByName.remove(uid);
+ }
+ }
+
if (changed) {
// First determine an order for the services.
ArrayList<ProcessItem> sortedProcesses = new ArrayList<ProcessItem>();