| commit | 48ea73746989b5f15e0faa546b5a2b63f40ab501 | [log] [tgz] |
|---|---|---|
| author | Michael Wachenschwanz <mwachens@google.com> | Tue Jan 02 21:33:08 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 02 21:33:08 2024 +0000 |
| tree | 83b1ceaed71173e7d5b186a4018e332680cc62e8 | |
| parent | 7c0f290aea3c7f3e5f36cdd5f1c899968b7ad65c [diff] | |
| parent | de3202df2337f10826f654c169e905ab87c60ef1 [diff] |
Merge "Revert^2 "Ignore testSetPolicyLevel_Adaptive"" into udc-dev am: de3202df23 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25778195 Change-Id: Id2747b45418f652448d98846b22b03b6426a362c 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 3102639..29e3d58 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
@@ -116,7 +116,7 @@ testServiceDefaultValue_On(ServiceType.NULL); } - @Suppress + @Suppress // TODO: b/317823111 - Remove once test fixed. @SmallTest public void testGetBatterySaverPolicy_PolicyVibration_DefaultValueCorrect() { testServiceDefaultValue_On(ServiceType.VIBRATION); @@ -202,7 +202,7 @@ testServiceDefaultValue_On(ServiceType.QUICK_DOZE); } - @Suppress + @Suppress // TODO: b/317823111 - Remove once test fixed. @SmallTest public void testUpdateConstants_getCorrectData() { mBatterySaverPolicy.updateConstantsLocked(BATTERY_SAVER_CONSTANTS, ""); @@ -302,6 +302,7 @@ } } + @Suppress // TODO: b/317823111 - Remove once test fixed. public void testSetPolicyLevel_Adaptive() { mBatterySaverPolicy.setPolicyLevel(POLICY_LEVEL_ADAPTIVE);