commit 5f06401807ef408a4b56a127bef1f0b55b0adcf6
author Sunny Goyal <sunnygoyal@google.com> Mon Aug 08 10:10:01 2016 -0700
committer Sunny Goyal <sunnygoyal@google.com> Mon Aug 08 10:13:33 2016 -0700
tree da9cc2700e2de2af6b53498582735da64971b983
parent bdc9f325b6eb97f674217bb0de51765e71b7023e

Fixing potential ConcurrentModificationException

mBgDeepShortcutMap is only accessed on the background thread. But
the same instance of list of values was getting passed to the UI
thread, instead of being cloned.

Change-Id: Ie7d0442d895304489ce9323ea872b9091d668ae5

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index a51fd07..34660ac 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2849,8 +2849,7 @@
     }
 
     public void bindDeepShortcuts() {
-        final MultiHashMap<ComponentKey, String> shortcutMapCopy = new MultiHashMap<>();
-        shortcutMapCopy.putAll(mBgDeepShortcutMap);
+        final MultiHashMap<ComponentKey, String> shortcutMapCopy = mBgDeepShortcutMap.clone();
         Runnable r = new Runnable() {
             @Override
             public void run() {