diff options
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest7.java | 6 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest8.java | 28 |
2 files changed, 17 insertions, 17 deletions
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest7.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest7.java index 5a89db143b34..4241aa95b09d 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest7.java +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest7.java @@ -109,7 +109,7 @@ public class ShortcutManagerTest7 extends BaseShortcutManagerTest { assertEquals(3, mService.mMaxUpdatesPerInterval); } - public void testRestConfig() throws Exception { + public void disabled_testRestConfig() throws Exception { mService.mMaxUpdatesPerInterval = 99; mInjectedCallingUid = Process.SHELL_UID; @@ -223,7 +223,7 @@ public class ShortcutManagerTest7 extends BaseShortcutManagerTest { } // This command is deprecated. Will remove the test later. - public void testLauncherCommands() throws Exception { + public void disabled_testLauncherCommands() throws Exception { prepareGetRoleHoldersAsUser(getSystemLauncher().activityInfo.packageName, USER_10); prepareGetHomeActivitiesAsUser( /* preferred */ getSystemLauncher().activityInfo.getComponentName(), @@ -401,7 +401,7 @@ public class ShortcutManagerTest7 extends BaseShortcutManagerTest { } - public void testDumpsysArgs() { + public void disabled_testDumpsysArgs() { checkDumpsysArgs(null, true, false, false); checkDumpsysArgs(array("-u"), true, true, false); checkDumpsysArgs(array("--uid"), true, true, false); diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest8.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest8.java index 1c0ee09ccc6f..19c26f0b60ab 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest8.java +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest8.java @@ -91,7 +91,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { assertEquals(USER_10, mService.getParentOrSelfUserId(USER_P0)); } - public void testIsRequestPinShortcutSupported() { + public void disabled_testIsRequestPinShortcutSupported() { setDefaultLauncher(USER_10, LAUNCHER_1); setDefaultLauncher(USER_11, LAUNCHER_2); @@ -168,7 +168,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { }); } - public void testRequestPinShortcut_notSupported() { + public void disabled_testRequestPinShortcut_notSupported() { // User-0's launcher has no confirmation activity. setDefaultLauncher(USER_10, LAUNCHER_1); @@ -322,7 +322,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { }); } - public void testRequestPinShortcut() { + public void disabled_testRequestPinShortcut() { checkRequestPinShortcut(/* resultIntent=*/ null); } @@ -332,7 +332,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { PendingIntent.FLAG_MUTABLE).getIntentSender(); } - public void testRequestPinShortcut_withCallback() { + public void disabled_testRequestPinShortcut_withCallback() { checkRequestPinShortcut(makeResultIntent()); } @@ -410,7 +410,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { }); } - public void testRequestPinShortcut_noTargetActivity_noMainActivity() { + public void disabled_testRequestPinShortcut_noTargetActivity_noMainActivity() { setDefaultLauncher(USER_10, LAUNCHER_1); setDefaultLauncher(USER_11, LAUNCHER_2); @@ -675,7 +675,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { }); } - public void testRequestPinShortcut_manifestExists_alreadyPinned() { + public void disabled_testRequestPinShortcut_manifestExists_alreadyPinned() { setDefaultLauncher(USER_10, LAUNCHER_1); runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> { @@ -757,7 +757,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { }); } - public void testRequestPinShortcut_wasDynamic_alreadyPinned() { + public void disabled_testRequestPinShortcut_wasDynamic_alreadyPinned() { setDefaultLauncher(USER_10, LAUNCHER_1); runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> { @@ -785,7 +785,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { }); } - public void testRequestPinShortcut_wasDynamic_disabled_alreadyPinned() { + public void disabled_testRequestPinShortcut_wasDynamic_disabled_alreadyPinned() { setDefaultLauncher(USER_10, LAUNCHER_1); runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> { @@ -816,7 +816,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { }); } - public void testRequestPinShortcut_wasManifest_alreadyPinned() { + public void disabled_testRequestPinShortcut_wasManifest_alreadyPinned() { setDefaultLauncher(USER_10, LAUNCHER_1); runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> { @@ -910,7 +910,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { }); } - public void testRequestPinShortcut_manifestExists_alreadyPinnedByAnother() { + public void disabled_testRequestPinShortcut_manifestExists_alreadyPinnedByAnother() { // Initially all launchers have the shortcut permission, until we call setDefaultLauncher(). runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> { @@ -1106,7 +1106,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { /** * When trying to pin an existing shortcut, the new fields shouldn't override existing fields. */ - public void testRequestPinShortcut_manifestExists_titleWontChange() { + public void disabled_testRequestPinShortcut_manifestExists_titleWontChange() { setDefaultLauncher(USER_10, LAUNCHER_1); runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> { @@ -1287,7 +1287,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { * The manifest shortcut existed, but before accepting(), it's removed. Because the request * has a partial shortcut, accept() should fail. */ - public void testRequestPinShortcut_manifestExists_thenRemoved_error() { + public void disabled_testRequestPinShortcut_manifestExists_thenRemoved_error() { setDefaultLauncher(USER_10, LAUNCHER_1); runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> { @@ -1344,7 +1344,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { * The manifest shortcut existed, but before accepting(), it's removed. Because the request * has all the mandatory fields, we can go ahead and still publish it. */ - public void testRequestPinShortcut_manifestExists_thenRemoved_okay() { + public void disabled_testRequestPinShortcut_manifestExists_thenRemoved_okay() { setDefaultLauncher(USER_10, LAUNCHER_1); runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> { @@ -1478,7 +1478,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { * The manifest shortcut existed, but before accepting(), it's removed. Because the request * has a partial shortcut, accept() should fail. */ - public void testRequestPinShortcut_manifestExists_thenDisabled_error() { + public void disabled_testRequestPinShortcut_manifestExists_thenDisabled_error() { setDefaultLauncher(USER_10, LAUNCHER_1); runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> { |