Merge "Fix BatterySaverPolicy night mode flag parsing." (af560c23) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -728,8 +728,8 @@ public class BatterySaverPolicy extends ContentObserver {
		!defaultPolicy.enableDataSaver);
		boolean enableFirewall = !parser.getBoolean(KEY_ACTIVATE_FIREWALL_DISABLED,
		!defaultPolicy.enableFirewall);
		boolean enableNightMode = !parser.getBoolean(KEY_ENABLE_NIGHT_MODE,
		!defaultPolicy.enableNightMode);
		boolean enableNightMode = parser.getBoolean(KEY_ENABLE_NIGHT_MODE,
		defaultPolicy.enableNightMode);
		boolean enableQuickDoze = parser.getBoolean(KEY_QUICK_DOZE_ENABLED,
		defaultPolicy.enableQuickDoze);
		boolean forceAllAppsStandby = parser.getBoolean(KEY_FORCE_ALL_APPS_STANDBY,

+5 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ public class BatterySaverPolicyTest extends AndroidTestCase {
		+ "fullbackup_deferred=true,"
		+ "keyvaluebackup_deferred=false,"
		+ "gps_mode=0," // LOCATION_MODE_NO_CHANGE
		+ "enable_night_mode=false,"
		+ "quick_doze_enabled=true";
		private static final String BATTERY_SAVER_INCORRECT_CONSTANTS = "vi*,!=,,true";

		@@ -234,6 +235,10 @@ public class BatterySaverPolicyTest extends AndroidTestCase {
		final PowerSaveState quickDozeState = mBatterySaverPolicy.getBatterySaverPolicy(
		ServiceType.QUICK_DOZE);
		assertThat(quickDozeState.batterySaverEnabled).isTrue();

		final PowerSaveState nightModeState = mBatterySaverPolicy.getBatterySaverPolicy(
		ServiceType.NIGHT_MODE);
		assertThat(nightModeState.batterySaverEnabled).isFalse();
		}

		@SmallTest