From ced31f304c0e95eb1a26191f316a33eaf17906b5 Mon Sep 17 00:00:00 2001 From: Michael Wachenschwanz Date: Tue, 2 Jan 2024 18:57:20 +0000 Subject: Revert^2 "Ignore testSetPolicyLevel_Adaptive" This reverts commit 2eff056ddc1fe76281759f5ab1115085b2742da2. Reason for revert: failing test in b/318032060 has nothing to do with the original CL and started passing before the revert landed. Fixes: 317737530 Change-Id: Iaaa7f442895eb139768a9a047c9b13a985a0b295 --- .../android/server/power/batterysaver/BatterySaverPolicyTest.java | 5 +++-- 1 file 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 3102639ff148..29e3d58696e6 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_On(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); -- cgit v1.2.3-59-g8ed1b