Merge "Fix concurrent modification error in ShortcutService" into sc-dev

2021-05-17 23:29:39 +00:00
parent 07791ca5bb 018017e208
commit 97bedd25c7
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -1213,7 +1213,9 @@ public class ShortcutService extends IShortcutService.Stub {
        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. */