From 3a0647fcd171b85e59d38b32f6d55bc054fc6eea Mon Sep 17 00:00:00 2001 From: Kate Montgomery Date: Thu, 6 May 2021 14:11:35 +0000 Subject: [PATCH] Update the default location mode for Battery Saver in order to get droidfood test coverage on the intended change. This value is also protected by flags so it can be set to the previous value while we run requested population experiments. Power tests show that this change causes a < 1% change in days of use (see b/178902585). Bug: 184875711 Test: Manual Change-Id: Ied13dc79b0dca655dea05ad61f0b54f81290673c --- .../android/server/power/batterysaver/BatterySaverPolicy.java | 2 +- .../server/power/batterysaver/BatterySaverPolicyTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/power/batterysaver/BatterySaverPolicy.java b/services/core/java/com/android/server/power/batterysaver/BatterySaverPolicy.java index 03584b9813513..cb366f34874dc 100644 --- a/services/core/java/com/android/server/power/batterysaver/BatterySaverPolicy.java +++ b/services/core/java/com/android/server/power/batterysaver/BatterySaverPolicy.java @@ -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 */ ); 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 9001b3ddaf8fb..443476ccf7b76 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 @@ -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;