git.osdn.net Git - android-x86/frameworks-base.git/commit

Revert "Push chooser targets to the shortcut manager."

This reverts commit 58fc95dc578244b7beb687a48184045dcce788b8.

Bug 36186790
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutHostTestCases
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases

Also all unit tests, except for the known failrues.
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests

Change-Id: I733ee7e12a419ee7ea17ca67c56afe7b039d189a

author	Makoto Onuki <omakoto@google.com>
	Wed, 29 Mar 2017 19:42:26 +0000 (12:42 -0700)
committer	Makoto Onuki <omakoto@google.com>
	Fri, 31 Mar 2017 22:16:43 +0000 (15:16 -0700)
commit	99302b55c6a960c9078ad2c84ae9be3296bd32f3
tree	43558e9f05da3b2cfbd694fd26cd38ab5521f68c	tree \| snapshot
parent	9220ff1f5a5793c3414ca823534a27ff19ed0801	commit \| diff

api/current.txt		diff \| blob \| history
api/system-current.txt		diff \| blob \| history
api/test-current.txt		diff \| blob \| history
core/java/android/content/pm/ILauncherApps.aidl		diff \| blob \| history
core/java/android/content/pm/LauncherApps.java		diff \| blob \| history
core/java/android/content/pm/ShortcutInfo.java		diff \| blob \| history
core/java/android/content/pm/ShortcutServiceInternal.java		diff \| blob \| history
core/java/com/android/internal/app/ChooserActivity.java		diff \| blob \| history
core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java		diff \| blob \| history
core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java		diff \| blob \| history
services/core/java/com/android/server/pm/LauncherAppsService.java		diff \| blob \| history
services/core/java/com/android/server/pm/ShortcutPackage.java		diff \| blob \| history
services/core/java/com/android/server/pm/ShortcutService.java		diff \| blob \| history
services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java		diff \| blob \| history
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java		diff \| blob \| history
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java		diff \| blob \| history
services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java		diff \| blob \| history