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

Change-Id: If132519e7ea02c56164eadfcaebdf4b4faf593a9
2020-04-06 15:30:54 +00:00
parent 1cff40bf3f d12c974db9
commit 1804e20423
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"}
      ]
    }
  ],