diff options
author | Tony Wickham <twickham@google.com> | 2016-08-29 15:17:48 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2016-08-30 00:09:11 +0000 |
commit | def6e474dad311224b97ae66f62c3313c6542955 (patch) | |
tree | 7048c0cb26a862f54a74efdbdd50d96a8fd0b7f8 /src/com/android/launcher3/util | |
parent | d70ef242332e766b2c23e3b8bb537dc2d584e9ec (diff) | |
download | android_packages_apps_Trebuchet-def6e474dad311224b97ae66f62c3313c6542955.tar.gz android_packages_apps_Trebuchet-def6e474dad311224b97ae66f62c3313c6542955.tar.bz2 android_packages_apps_Trebuchet-def6e474dad311224b97ae66f62c3313c6542955.zip |
Use promisedIntent instead of intent when deep shortcuts are restored.
This ensures that the intent has the package corresponding to the
shortcut publisher, rather than a market intent. It also ensures that
the intent has the EXTRA_SHORTCUT_ID attached.
Bug: 31123204
Change-Id: I05d56396b629880322e915f52bfc0605b921b0b1
(cherry picked from commit fc02c1b446ee54561ac7351fb6ff0f8294785f0e)
Diffstat (limited to 'src/com/android/launcher3/util')
-rw-r--r-- | src/com/android/launcher3/util/ItemInfoMatcher.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/util/ItemInfoMatcher.java b/src/com/android/launcher3/util/ItemInfoMatcher.java index 6189bf2f4..46e9184b4 100644 --- a/src/com/android/launcher3/util/ItemInfoMatcher.java +++ b/src/com/android/launcher3/util/ItemInfoMatcher.java @@ -20,6 +20,7 @@ import android.content.ComponentName; import com.android.launcher3.ItemInfo; import com.android.launcher3.LauncherSettings.Favorites; +import com.android.launcher3.ShortcutInfo; import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.shortcuts.ShortcutKey; @@ -57,7 +58,7 @@ public abstract class ItemInfoMatcher { @Override public boolean matches(ItemInfo info, ComponentName cn) { return info.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT && - keys.contains(ShortcutKey.fromItemInfo(info)); + keys.contains(ShortcutKey.fromShortcutInfo((ShortcutInfo) info)); } }; } |