diff options
| author | Winson Chung <winsonc@google.com> | 2012-06-06 16:17:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-06 16:17:04 -0700 |
| commit | 478244409e15594ceaa7426a6a23cc805db0b1fc (patch) | |
| tree | 078917028e2c0fa70394e9444733a1c6d4c253cc /src/com/android/launcher2/Workspace.java | |
| parent | 5766032503a4ace048e69d6540a46134a858cbb9 (diff) | |
| parent | bfeac0681b63091731c853fdafa3206642449a9d (diff) | |
| download | android_packages_apps_Trebuchet-478244409e15594ceaa7426a6a23cc805db0b1fc.tar.gz android_packages_apps_Trebuchet-478244409e15594ceaa7426a6a23cc805db0b1fc.tar.bz2 android_packages_apps_Trebuchet-478244409e15594ceaa7426a6a23cc805db0b1fc.zip | |
Merge "Synchronizing on the new-apps list before modifying it. (Bug 6621553)" into jb-dev
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 8b9662b3b..11eb3c15b 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -3682,14 +3682,16 @@ public class Workspace extends SmoothPagedView } // Remove all queued items that match the same package if (newApps != null) { - for (String intentStr : newApps) { - try { - Intent intent = Intent.parseUri(intentStr, 0); - String pn = ItemInfo.getPackageName(intent); - if (packageNames.contains(pn)) { - newApps.remove(intentStr); - } - } catch (URISyntaxException e) {} + synchronized (newApps) { + for (String intentStr : newApps) { + try { + Intent intent = Intent.parseUri(intentStr, 0); + String pn = ItemInfo.getPackageName(intent); + if (packageNames.contains(pn)) { + newApps.remove(intentStr); + } + } catch (URISyntaxException e) {} + } } } } |