Merge "Re-enable PowerStatsTestsRavenwood" into main

2 files changed, 3 insertions, 5 deletions

diff --git a/services/tests/powerstatstests/Android.bp b/services/tests/powerstatstests/Android.bp
index d786f3fc52a0..631f76ace958 100644
--- a/services/tests/powerstatstests/Android.bp
+++ b/services/tests/powerstatstests/Android.bp
@@ -65,13 +65,12 @@ android_ravenwood_test {
         "androidx.annotation_annotation",
         "androidx.test.rules",
         "androidx.test.uiautomator_uiautomator",
+        "androidx.test.ext.junit",
         "modules-utils-binary-xml",
         "flag-junit",
     ],
     srcs: [
-        // b/375477626 -- somehow this test is failing in presubmit on AOSP.
-        // This module is devlopped internal-fast, so we don't need to run it on AOSP.
-        //        "src/com/android/server/power/stats/*.java",
+        "src/com/android/server/power/stats/*.java",
     ],
     java_resources: [
         "res/xml/power_profile*.xml",
diff --git a/services/tests/powerstatstests/TEST_MAPPING b/services/tests/powerstatstests/TEST_MAPPING
index 4e209f473ff3..d3d3cf641d9a 100644
--- a/services/tests/powerstatstests/TEST_MAPPING
+++ b/services/tests/powerstatstests/TEST_MAPPING
@@ -9,8 +9,7 @@
       "name": "PowerStatsTestsRavenwood",
       "host": true,
       "options": [
-        {"include-filter": "com.android.server.power.stats"},
-        {"exclude-annotation": "android.platform.test.annotations.DisabledOnRavenwood"}
+        {"include-filter": "com.android.server.power.stats"}
       ]
     }
   ],