diff options
| author | 2023-12-29 08:37:51 +0000 | |
|---|---|---|
| committer | 2023-12-29 08:37:51 +0000 | |
| commit | 2829fded4cfe6da5e5a4cef2ce52dbe6bfb45e56 (patch) | |
| tree | ed73a32f24f2452f806abff6082c83f0e46a36ec | |
| parent | c15578db7e5e78572ceb0694bf553586387d6987 (diff) | |
| parent | 7c0f290aea3c7f3e5f36cdd5f1c899968b7ad65c (diff) | |
Merge "Revert "Ignore testSetPolicyLevel_Adaptive"" into udc-dev am: eb5f7f8b4e am: 7c0f290aea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25756821
Change-Id: I9ce812be1dad0a1ef035241bb0573dc1497e33da
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, 2 insertions, 3 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 6fffd7533df8..835ccf0b19f6 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 @@ public class BatterySaverPolicyTest extends AndroidTestCase { testServiceDefaultValue_On(ServiceType.NULL); } - @Suppress // TODO: b/317823111 - Remove once test fixed. + @Suppress @SmallTest public void testGetBatterySaverPolicy_PolicyVibration_DefaultValueCorrect() { testDefaultValue( @@ -219,7 +219,7 @@ public class BatterySaverPolicyTest extends AndroidTestCase { ServiceType.QUICK_DOZE); } - @Suppress // TODO: b/317823111 - Remove once test fixed. + @Suppress @SmallTest public void testUpdateConstants_getCorrectData() { mBatterySaverPolicy.updateConstantsLocked(BATTERY_SAVER_CONSTANTS, ""); @@ -327,7 +327,6 @@ public class BatterySaverPolicyTest extends AndroidTestCase { } } - @Suppress // TODO: b/317823111 - Remove once test fixed. public void testSetPolicyLevel_Adaptive() { mBatterySaverPolicy.setPolicyLevel(POLICY_LEVEL_ADAPTIVE); |