Merge "Remove exclude filter on PowerManger test mapping" into rvc-dev am: 51e6f8ff26 am: 047693a1b1

Change-Id: I6c29047813a9f1f5bdee473e45f69eee15e209e6
2020-04-06 14:58:00 +00:00
parent b083e18e75 047693a1b1
commit d12c974db9
1 changed files with 1 additions and 4 deletions
--- a/services/core/java/com/android/server/power/TEST_MAPPING
+++ b/services/core/java/com/android/server/power/TEST_MAPPING
@@ -21,10 +21,7 @@
      "options": [
        {"include-filter": "com.android.server.power"},
        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
-        {"exclude-annotation": "androidx.test.filters.FlakyTest"},
-        {
-          "exclude-filter": "com.android.server.power.PowerManagerServiceTest#testWakefulnessAwake_ShouldWakeUpWhenPluggedIn"
-        }
+        {"exclude-annotation": "androidx.test.filters.FlakyTest"}
      ]
    }
  ],