Revert "Disable failing tests."

This reverts commit 89e1c8f40d81c3b9fa3913433b25b2f079a620af.

Reason for revert: Droidmonitor created revert due to b/390760006. Will be verifying through ABTD before submission.

Change-Id: I76d8a9bd077bce670e75c2cbe956995de7e0307c

2 files changed, 9 insertions, 10 deletions

diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
index 3b32701b5169..39206dcf21ef 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
@@ -1612,7 +1612,7 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest {
                 );
     }
 
-    public void disabled_testThrottling() {
+    public void testThrottling() {
         final ShortcutInfo si1 = makeShortcut("shortcut1");
 
         assertTrue(mManager.setDynamicShortcuts(list(si1)));
@@ -1685,7 +1685,7 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest {
         assertEquals(START_TIME + INTERVAL * 9, mManager.getRateLimitResetTime());
     }
 
-    public void disabled_testThrottling_rewind() {
+    public void testThrottling_rewind() {
         final ShortcutInfo si1 = makeShortcut("shortcut1");
 
         assertTrue(mManager.setDynamicShortcuts(list(si1)));
@@ -1715,7 +1715,7 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest {
         assertEquals(3, mManager.getRemainingCallCount());
     }
 
-    public void disabled_testThrottling_perPackage() {
+    public void testThrottling_perPackage() {
         final ShortcutInfo si1 = makeShortcut("shortcut1");
 
         assertTrue(mManager.setDynamicShortcuts(list(si1)));
@@ -1847,7 +1847,7 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest {
         });
     }
 
-    public void disabled_testThrottling_foreground() throws Exception {
+    public void testThrottling_foreground() throws Exception {
         prepareCrossProfileDataSet();
 
         dumpsysOnLogcat("Before save & load");
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest3.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest3.java
index 81ebf867fe2d..aad06c6d6c0e 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest3.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest3.java
@@ -171,12 +171,11 @@ public class ShortcutManagerTest3 extends BaseShortcutManagerTest {
                 .haveRanksInOrder("ms1");
     }
 
-    public void disabled_testSetDynamicShortcuts_withManifestShortcuts() {
-        runTestWithManifestShortcuts(() ->
-                disabled_testAddDynamicShortcuts_noManifestShortcuts());
+    public void testSetDynamicShortcuts_withManifestShortcuts() {
+        runTestWithManifestShortcuts(() -> testSetDynamicShortcuts_noManifestShortcuts());
     }
 
-    public void disabled_testAddDynamicShortcuts_noManifestShortcuts() {
+    public void testAddDynamicShortcuts_noManifestShortcuts() {
         mManager.addDynamicShortcuts(list(
                 shortcut("s1", A1)
         ));
@@ -265,8 +264,8 @@ public class ShortcutManagerTest3 extends BaseShortcutManagerTest {
                 .haveIds("s1", "s2", "s4", "s5", "s10");
     }
 
-    public void disabled_testAddDynamicShortcuts_withManifestShortcuts() {
-        runTestWithManifestShortcuts(() -> disabled_testAddDynamicShortcuts_noManifestShortcuts());
+    public void testAddDynamicShortcuts_withManifestShortcuts() {
+        runTestWithManifestShortcuts(() -> testAddDynamicShortcuts_noManifestShortcuts());
     }
 
     public void testUpdateShortcuts_noManifestShortcuts() {