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

Commit a3fd6618 authored by Wesley Wang's avatar Wesley Wang Committed by Automerger Merge Worker
Browse files

Merge "Update battery saver haptics mode" into udc-d1-dev am: 9dcfdf8e 

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



Change-Id: I9631605e8ba7c83f8569a42e7ad4c8148a36f94a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83ef9b4c 9dcfdf8e

services/core/java/com/android/server/power/batterysaver/BatterySaverPolicy.java

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ public class BatterySaverPolicy extends ContentObserver implements 
            true,  /* disableAod */

            true,  /* disableLaunchBoost */

            true,  /* disableOptionalSensors */

            true,  /* disableVibration */

            false,  /* disableVibration */

            false, /* enableAdjustBrightness */

            false, /* enableDataSaver */

            true,  /* enableFirewall */

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

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class BatterySaverPolicyTest extends AndroidTestCase { 
    private static final int SOUND_TRIGGER_MODE = 0; // SOUND_TRIGGER_MODE_ALL_ENABLED

    private static final int DEFAULT_SOUND_TRIGGER_MODE =

            PowerManager.SOUND_TRIGGER_MODE_CRITICAL_ONLY;

    private static final String BATTERY_SAVER_CONSTANTS = "disable_vibration=true,"

    private static final String BATTERY_SAVER_CONSTANTS = "disable_vibration=false,"

            + "advertise_is_enabled=true,"

            + "disable_animation=false,"

            + "enable_firewall=true,"
@@ -117,7 +117,7 @@ public class BatterySaverPolicyTest extends AndroidTestCase { 


    @SmallTest

    public void testGetBatterySaverPolicy_PolicyVibration_DefaultValueCorrect() {

        testServiceDefaultValue_On(ServiceType.VIBRATION);

        testServiceDefaultValue_Off(ServiceType.VIBRATION);

    }



    @SmallTest
@@ -211,7 +211,7 @@ public class BatterySaverPolicyTest extends AndroidTestCase { 
    private void verifyBatterySaverConstantsUpdated() {

        final PowerSaveState vibrationState =

                mBatterySaverPolicy.getBatterySaverPolicy(ServiceType.VIBRATION);

        assertThat(vibrationState.batterySaverEnabled).isTrue();

        assertThat(vibrationState.batterySaverEnabled).isFalse();



        final PowerSaveState animationState =

                mBatterySaverPolicy.getBatterySaverPolicy(ServiceType.ANIMATION);