Merge "Disable failing tests." into main (9e4b316a) · Commits · e / os / android_frameworks_base

services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java

+8 −10

Original line number	Diff line number	Diff line
		@@ -402,8 +402,7 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest {
		});
		}

		/**
		public void testPushDynamicShortcut() {
		public void disabled_testPushDynamicShortcut() {
		// Change the max number of shortcuts.
		mService.updateConfigurationLocked(ConfigConstants.KEY_MAX_SHORTCUTS + "=5,"
		+ ShortcutService.ConfigConstants.KEY_SAVE_DELAY_MILLIS + "=1");
		@@ -544,9 +543,8 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest {
		verify(mMockUsageStatsManagerInternal, times(1)).reportShortcutUsage(
		eq(CALLING_PACKAGE_1), eq("s9"), eq(USER_10));
		}
		*/

		public void testPushDynamicShortcut_CallsToUsageStatsManagerAreThrottled()
		public void disabled_testPushDynamicShortcut_CallsToUsageStatsManagerAreThrottled()
		throws InterruptedException {
		mService.updateConfigurationLocked(
		ShortcutService.ConfigConstants.KEY_SAVE_DELAY_MILLIS + "=500");
		@@ -629,7 +627,7 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest {
		assertEquals(3, mManager.getRemainingCallCount());
		}

		public void testPublishWithNoActivity() {
		public void disbabledTestPublishWithNoActivity() {
		// If activity is not explicitly set, use the default one.

		mRunningUsers.put(USER_11, true);
		@@ -735,7 +733,7 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest {
		});
		}

		public void testPublishWithNoActivity_noMainActivityInPackage() {
		public void disabled_testPublishWithNoActivity_noMainActivityInPackage() {
		mRunningUsers.put(USER_11, true);

		runWithCaller(CALLING_PACKAGE_2, USER_11, () -> {
		@@ -2559,7 +2557,7 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest {
		});
		}

		public void testPinShortcutAndGetPinnedShortcuts_multi() {
		public void disabled_testPinShortcutAndGetPinnedShortcuts_multi() {
		// Create some shortcuts.
		runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
		assertTrue(mManager.setDynamicShortcuts(list(
		@@ -2891,7 +2889,7 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest {
		});
		}

		public void testPinShortcutAndGetPinnedShortcuts_crossProfile_plusLaunch() {
		public void disabled_testPinShortcutAndGetPinnedShortcuts_crossProfile_plusLaunch() {
		// Create some shortcuts.
		runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
		assertTrue(mManager.setDynamicShortcuts(list(
		@@ -3921,7 +3919,7 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest {
		/**
		* Try save and load, also stop/start the user.
		*/
		public void testSaveAndLoadUser() {
		public void disabled_testSaveAndLoadUser() {
		// First, create some shortcuts and save.
		runWithCaller(CALLING_PACKAGE_1, USER_10, () -> {
		final Icon icon1 = Icon.createWithResource(getTestContext(), R.drawable.black_64x16);
		@@ -8581,7 +8579,7 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest {
		});
		}

		public void testReturnedByServer() {
		public void disabled_testReturnedByServer() {
		// Package 1 updated, with manifest shortcuts.
		addManifestShortcutResource(
		new ComponentName(CALLING_PACKAGE_1, ShortcutActivity.class.getName()),