OSDN Git Service

Use promisedIntent instead of intent when deep shortcuts are restored.
authorTony Wickham <twickham@google.com>
Mon, 29 Aug 2016 22:17:48 +0000 (15:17 -0700)
committerAdam Cohen <adamcohen@google.com>
Tue, 30 Aug 2016 00:09:11 +0000 (00:09 +0000)
commitdef6e474dad311224b97ae66f62c3313c6542955
tree7048c0cb26a862f54a74efdbdd50d96a8fd0b7f8
parentd70ef242332e766b2c23e3b8bb537dc2d584e9ec
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)
src/com/android/launcher3/Launcher.java
src/com/android/launcher3/LauncherModel.java
src/com/android/launcher3/ShortcutInfo.java
src/com/android/launcher3/shortcuts/ShortcutKey.java
src/com/android/launcher3/util/ItemInfoMatcher.java