diff options
| author | 2024-01-02 22:05:11 +0000 | |
|---|---|---|
| committer | 2024-01-02 22:05:11 +0000 | |
| commit | bd1bba33bad33cbb642d43968d8dc7ccab3d020c (patch) | |
| tree | 59d0b01669f2197afc3c77a4ba7bac86cfceb882 | |
| parent | 926939d42df7dcdd7ea66dfd621f40cef9c42e77 (diff) | |
| parent | 2139011282ec85cea1b7a3d5e586ba1a0cf1eb58 (diff) | |
Merge "Revert^2 "Ignore testSetPolicyLevel_Adaptive"" into udc-dev am: de3202df23 am: 2139011282
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25778195
Change-Id: Ib1cc4e8d36eecccc7618741e3cbc90754c2c9f8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java | 5 |
1 files changed, 3 insertions, 2 deletions
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 5f84e9ee54d0..3d3688e5c678 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 @@ public class BatterySaverPolicyTest extends AndroidTestCase { testServiceDefaultValue_On(ServiceType.NULL); } - @Suppress + @Suppress // TODO: b/317823111 - Remove once test fixed. @SmallTest public void testGetBatterySaverPolicy_PolicyVibration_DefaultValueCorrect() { testServiceDefaultValue_Off(ServiceType.VIBRATION); @@ -202,7 +202,7 @@ public class BatterySaverPolicyTest extends AndroidTestCase { 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 @@ public class BatterySaverPolicyTest extends AndroidTestCase { } } + @Suppress // TODO: b/317823111 - Remove once test fixed. public void testSetPolicyLevel_Adaptive() { mBatterySaverPolicy.setPolicyLevel(POLICY_LEVEL_ADAPTIVE); |