Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0c02daa authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by Automerger Merge Worker
Browse files

Merge "Ignore testSetPolicyLevel_Adaptive" into udc-dev am: 6690e6f4 am: cd46817b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25755430



Change-Id: I881d107dba5cc8566761139f3939800b46cf45c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed607673 cd46817b

services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java

+3 −2
Original line number Diff line number Diff line
@@ -112,7 +112,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() {

        testDefaultValue(
@@ -219,7 +219,7 @@ public class BatterySaverPolicyTest extends AndroidTestCase { 
                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 @@ public class BatterySaverPolicyTest extends AndroidTestCase { 
        }

    }



    @Suppress // TODO: b/317823111 - Remove once test fixed.

    public void testSetPolicyLevel_Adaptive() {

        mBatterySaverPolicy.setPolicyLevel(POLICY_LEVEL_ADAPTIVE);