| commit | 9534d497232d5253a716c6224065a96b7def1318 | [log] [tgz] |
|---|---|---|
| author | Michael Wachenschwanz <mwachens@google.com> | Tue Jan 02 22:04:29 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 02 22:04:29 2024 +0000 |
| tree | 521dd59af5667f3931594f8e3b2bb7327d51216d | |
| parent | 98909efab99fa65c64104bc2a7a39aa26b02dd19 [diff] | |
| parent | 48ea73746989b5f15e0faa546b5a2b63f40ab501 [diff] |
Merge "Revert^2 "Ignore testSetPolicyLevel_Adaptive"" into udc-dev am: de3202df23 am: 48ea737469 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25778195 Change-Id: I248dd69975f1e832f4b016a28134bd5a633ea388 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java b/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java index 835ccf0..6fffd75 100644 --- a/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java +++ b/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java
@@ -112,7 +112,7 @@ testServiceDefaultValue_On(ServiceType.NULL); } - @Suppress + @Suppress // TODO: b/317823111 - Remove once test fixed. @SmallTest public void testGetBatterySaverPolicy_PolicyVibration_DefaultValueCorrect() { testDefaultValue( @@ -219,7 +219,7 @@ ServiceType.QUICK_DOZE); } - @Suppress + @Suppress // TODO: b/317823111 - Remove once test fixed. @SmallTest public void testUpdateConstants_getCorrectData() { mBatterySaverPolicy.updateConstantsLocked(BATTERY_SAVER_CONSTANTS, ""); @@ -327,6 +327,7 @@ } } + @Suppress // TODO: b/317823111 - Remove once test fixed. public void testSetPolicyLevel_Adaptive() { mBatterySaverPolicy.setPolicyLevel(POLICY_LEVEL_ADAPTIVE);