Re-enable PowerStatsTestsRavenwood
Flag: EXEMPT host test change only
Bug: 374998609
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Merged-in: Iefd574dbded8c4ab2e244c4918c26641364a3432
Change-Id: Id2787abd815eb39917e42c0b9cdd83f35a9661fe
diff --git a/services/tests/powerstatstests/Android.bp b/services/tests/powerstatstests/Android.bp
index d786f3fc..631f76a 100644
--- a/services/tests/powerstatstests/Android.bp
+++ b/services/tests/powerstatstests/Android.bp
@@ -65,13 +65,12 @@
"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 4e209f4..d3d3cf6 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"}
]
}
],