Fix concurrent modification error in ShortcutService
The internal api ShortcutService#postValue isn't protected by mLock and
thus causing concurrent modification exception.
This CL temprorary fixes the issue by protecting above api with existing
lock. In the long run we should be moving the lock to package level,
which will be implemented in b/186011943
Bug: 187062117, 188397473, 188277633
Test: manual
Change-Id: I93537f8abe7a2ec2787949d109c6b3045664d8dd
diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index 20f35f2..1e9d7e1 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -1213,7 +1213,9 @@
final String pkg = shortcutInfo.getPackage();
final int userId = shortcutInfo.getUserId();
final String id = shortcutInfo.getId();
- getPackageShortcutsLocked(pkg, userId).mutateShortcut(id, shortcutInfo, cb);
+ synchronized (mLock) {
+ getPackageShortcutsLocked(pkg, userId).mutateShortcut(id, shortcutInfo, cb);
+ }
}
/** Return the last reset time. */
