Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pinyao Ting
2021-05-17 23:29:39 +00:00
committed by Android (Google) Code Review
parent 07791ca5bb 018017e208
commit 97bedd25c7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/ShortcutService.java
View File

@@ -1213,7 +1213,9 @@ public class ShortcutService extends IShortcutService.Stub {
final String pkg = shortcutInfo.getPackage(); final String pkg = shortcutInfo.getPackage();
final int userId = shortcutInfo.getUserId(); final int userId = shortcutInfo.getUserId();
final String id = shortcutInfo.getId(); 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. */ /** Return the last reset time. */