diff options
| author | Winson Chung <winsonc@google.com> | 2012-06-25 14:48:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-25 14:48:43 -0700 |
| commit | b187a56b8c46e5d25210bbc7ee3f2afb0d8ac0bd (patch) | |
| tree | a004369142fa291f55a80a6630e8072cc5728d55 /src | |
| parent | b1daa48fc8245a2cdb843da0977b7147c7891f7e (diff) | |
| parent | bcff7eda3731b7af254a1d5182766683ea1d46e3 (diff) | |
| download | android_packages_apps_Trebuchet-b187a56b8c46e5d25210bbc7ee3f2afb0d8ac0bd.tar.gz android_packages_apps_Trebuchet-b187a56b8c46e5d25210bbc7ee3f2afb0d8ac0bd.tar.bz2 android_packages_apps_Trebuchet-b187a56b8c46e5d25210bbc7ee3f2afb0d8ac0bd.zip | |
am bcff7eda: am 9dc25f06: Merge "Fixing concurrent modification exception when iterating through new apps list. (Bug 6621553)" into jb-dev
* commit 'bcff7eda3731b7af254a1d5182766683ea1d46e3':
Fixing concurrent modification exception when iterating through new apps list. (Bug 6621553)
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index ede7d884e..1bd0a3598 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -3658,12 +3658,13 @@ public class Workspace extends SmoothPagedView // Remove all queued items that match the same package if (newApps != null) { synchronized (newApps) { - for (String intentStr : newApps) { + Iterator<String> iter = newApps.iterator(); + while (iter.hasNext()) { try { - Intent intent = Intent.parseUri(intentStr, 0); + Intent intent = Intent.parseUri(iter.next(), 0); String pn = ItemInfo.getPackageName(intent); if (packageNames.contains(pn)) { - newApps.remove(intentStr); + iter.remove(); } } catch (URISyntaxException e) {} } |