diff options
| author | Tony Wickham <twickham@google.com> | 2016-07-27 18:22:41 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2016-07-28 17:17:51 +0000 |
| commit | 672d07f3f0bee663ad8447fbbb2890760c1a18ce (patch) | |
| tree | 8eb68be598ec3ffe7b6d80c9e351bf3340c9371c /src | |
| parent | 71538da6e2e70af15684cc270a6e67c9b5a010dc (diff) | |
| download | android_packages_apps_Trebuchet-672d07f3f0bee663ad8447fbbb2890760c1a18ce.tar.gz android_packages_apps_Trebuchet-672d07f3f0bee663ad8447fbbb2890760c1a18ce.tar.bz2 android_packages_apps_Trebuchet-672d07f3f0bee663ad8447fbbb2890760c1a18ce.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 8 | ||||
| -rw-r--r-- | src/com/android/launcher3/ShortcutInfo.java | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 456111115..17c39faa2 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -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); + } } } } diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java index 0cc5a1b92..c87bc08c9 100644 --- a/src/com/android/launcher3/ShortcutInfo.java +++ b/src/com/android/launcher3/ShortcutInfo.java @@ -28,7 +28,6 @@ import android.text.TextUtils; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.compat.LauncherActivityInfoCompat; -import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.compat.UserManagerCompat; import com.android.launcher3.folder.FolderIcon; |