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

Commit 5c442fe7 authored by Kate Montgomery's avatar Kate Montgomery Committed by Automerger Merge Worker
Browse files

Merge "Update the default location mode for Battery Saver in order to get... 

Merge "Update the default location mode for Battery Saver in order to get droidfood test coverage on the intended change." into sc-dev am: 3458ddf5 am: 7fa3dfa3

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

Change-Id: I732189890f7bc64e5afb5f3f565c685f077184ab
parents 4501f5fa 7fa3dfa3

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

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

            true, /* forceAllAppsStandby */

            true, /* forceBackgroundCheck */

            PowerManager.LOCATION_MODE_ALL_DISABLED_WHEN_SCREEN_OFF, /* locationMode */

            PowerManager.LOCATION_MODE_FOREGROUND_ONLY, /* locationMode */

            PowerManager.SOUND_TRIGGER_MODE_CRITICAL_ONLY /* soundTriggerMode */

    );

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

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class BatterySaverPolicyTest extends AndroidTestCase { 
    private static final float PRECISION = 0.001f;

    private static final int GPS_MODE = 0; // LOCATION_MODE_NO_CHANGE

    private static final int DEFAULT_GPS_MODE =

            PowerManager.LOCATION_MODE_ALL_DISABLED_WHEN_SCREEN_OFF;

            PowerManager.LOCATION_MODE_FOREGROUND_ONLY;

    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;