am 9dc25f06: Merge "Fixing concurrent modification exception when iterating through new apps list. (Bug 6621553)" into jb-dev

* commit '9dc25f06a870938a2adb976194da78574825e83e':
  Fixing concurrent modification exception when iterating through new apps list. (Bug 6621553)
This commit is contained in:
Winson Chung
2012-06-25 14:47:03 -07:00
committed by Android Git Automerger
+4 -3
View File
@@ -3684,12 +3684,13 @@ public class Workspace extends SmoothPagedView
// Remove all queued items that match the same package // Remove all queued items that match the same package
if (newApps != null) { if (newApps != null) {
synchronized (newApps) { synchronized (newApps) {
for (String intentStr : newApps) { Iterator<String> iter = newApps.iterator();
while (iter.hasNext()) {
try { try {
Intent intent = Intent.parseUri(intentStr, 0); Intent intent = Intent.parseUri(iter.next(), 0);
String pn = ItemInfo.getPackageName(intent); String pn = ItemInfo.getPackageName(intent);
if (packageNames.contains(pn)) { if (packageNames.contains(pn)) {
newApps.remove(intentStr); iter.remove();
} }
} catch (URISyntaxException e) {} } catch (URISyntaxException e) {}
} }