Check package name and user handle in onShortcutsChanged().
Otherwise shortcuts with the same id would be updated, even if they were in different packages. Bug: 28980830 Change-Id: Ideefe3aaac83af38c03a38d821bac192ae55fe67
This commit is contained in:
1 parent
71538da6e2
commit
672d07f3f0
2 files changed
+5
-4
No files matched your search
@@ -3332,9 +3332,11 @@ public class LauncherModel extends BroadcastReceiver
|
||||
for (ItemInfo itemInfo : sBgItemsIdMap) {
|
||||
if (itemInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
|
||||
ShortcutInfo si = (ShortcutInfo) itemInfo;
|
||||
String shortcutId = si.getDeepShortcutId();
|
||||
if (idsToShortcuts.containsKey(shortcutId)) {
|
||||
idsToWorkspaceShortcutInfos.addToList(shortcutId, si);
|
||||
if (si.getIntent().getPackage().equals(mPackageName) && si.user.equals(mUser)) {
|
||||
String shortcutId = si.getDeepShortcutId();
|
||||
if (idsToShortcuts.containsKey(shortcutId)) {
|
||||
idsToWorkspaceShortcutInfos.addToList(shortcutId, si);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user