diff options
author | Tony Wickham <twickham@google.com> | 2016-08-29 15:17:48 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2016-08-29 15:59:28 -0700 |
commit | fc02c1b446ee54561ac7351fb6ff0f8294785f0e (patch) | |
tree | a4fdb8c15c5c1613bef61dd1d8ce5227216f8a23 /src/com/android/launcher3/shortcuts | |
parent | 4a4b49ff3482cbe7f8192807cdc99437810fe518 (diff) | |
download | android_packages_apps_Trebuchet-fc02c1b446ee54561ac7351fb6ff0f8294785f0e.tar.gz android_packages_apps_Trebuchet-fc02c1b446ee54561ac7351fb6ff0f8294785f0e.tar.bz2 android_packages_apps_Trebuchet-fc02c1b446ee54561ac7351fb6ff0f8294785f0e.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
Diffstat (limited to 'src/com/android/launcher3/shortcuts')
-rw-r--r-- | src/com/android/launcher3/shortcuts/ShortcutKey.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/shortcuts/ShortcutKey.java b/src/com/android/launcher3/shortcuts/ShortcutKey.java index 405303042..a219c5494 100644 --- a/src/com/android/launcher3/shortcuts/ShortcutKey.java +++ b/src/com/android/launcher3/shortcuts/ShortcutKey.java @@ -3,7 +3,7 @@ package com.android.launcher3.shortcuts; import android.content.ComponentName; import android.content.Intent; -import com.android.launcher3.ItemInfo; +import com.android.launcher3.ShortcutInfo; import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.util.ComponentKey; @@ -32,7 +32,7 @@ public class ShortcutKey extends ComponentKey { return new ShortcutKey(intent.getPackage(), user, shortcutId); } - public static ShortcutKey fromItemInfo(ItemInfo info) { - return fromIntent(info.getIntent(), info.user); + public static ShortcutKey fromShortcutInfo(ShortcutInfo info) { + return fromIntent(info.getPromisedIntent(), info.user); } } |