440a1ea8e2204ecb171e0187318beb2f08f6012c - LeafOS-Project/android_frameworks_base

commit	440a1ea8e2204ecb171e0187318beb2f08f6012c	[log] [tgz]
author	Makoto Onuki <omakoto@google.com>	Wed Jul 20 14:21:18 2016 -0700
committer	Makoto Onuki <omakoto@google.com>	Wed Jul 20 14:46:48 2016 -0700
tree	2815133dcf4b4f253f8e76c0f6866d3e0106ade7
parent	ceadb1a86a00475d572a99053a0dcbd5bcc2f93d [diff]

Support multiple intents in ShortcutInfo

Also fix b/30230996.

TODO: Support the sourceBounds argument to LauncherApps.
startShortcut().

Bug 30218829
Bug 30230996

Change-Id: Ibb6c59d5b7c0a320c21d09436d016d0eac94644f

core/java/android/app/ActivityManagerInternal.java[diff]
core/java/android/content/pm/ShortcutInfo.java[diff]
core/java/android/content/pm/ShortcutServiceInternal.java[diff]
core/java/android/os/Parcel.java[diff]
services/core/java/com/android/server/am/ActivityManagerService.java[diff]
services/core/java/com/android/server/pm/LauncherAppsService.java[diff]
services/core/java/com/android/server/pm/ShortcutPackage.java[diff]
services/core/java/com/android/server/pm/ShortcutPackageInfo.java[diff]
services/core/java/com/android/server/pm/ShortcutParser.java[diff]
services/core/java/com/android/server/pm/ShortcutService.java[diff]
services/tests/servicestests/res/xml/shortcut_error_4.xml[diff]
services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java[diff]
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java[diff]
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java[diff]
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest4.java[diff]
services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java[diff]

16 files changed

tree: 2815133dcf4b4f253f8e76c0f6866d3e0106ade7