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

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

Merge "Revert^2 "Ignore testSetPolicyLevel_Adaptive"" into udc-dev am:... 

Merge "Revert^2 "Ignore testSetPolicyLevel_Adaptive"" into udc-dev am: de3202df am: 21390112 am: bd1bba33

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



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

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

+3 −2
Original line number Diff line number Diff line
@@ -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);