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

Commit fe1312fd authored Jun 02, 2022 by xuezaiyue

Add Settings.Secure.ADAPTIVE_CHARGING_ENABLED and

Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED
to backup settings allowlist.

Bug: 230386304
Test: manual
Change-Id: Iba681349e5b305de3b4f3704e913927ac8ffa104

parent 2c108ffd

packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -78,6 +78,7 @@ public class GlobalSettings {
	Settings.Global.POWER_BUTTON_LONG_PRESS,		Settings.Global.POWER_BUTTON_LONG_PRESS,
	Settings.Global.AUTOMATIC_POWER_SAVE_MODE,		Settings.Global.AUTOMATIC_POWER_SAVE_MODE,
	Settings.Global.ADVANCED_BATTERY_USAGE_AMOUNT,		Settings.Global.ADVANCED_BATTERY_USAGE_AMOUNT,
			Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED,
	Settings.Global.POWER_BUTTON_LONG_PRESS_DURATION_MS,		Settings.Global.POWER_BUTTON_LONG_PRESS_DURATION_MS,
	Settings.Global.USER_PREFERRED_REFRESH_RATE,		Settings.Global.USER_PREFERRED_REFRESH_RATE,
	Settings.Global.USER_PREFERRED_RESOLUTION_HEIGHT,		Settings.Global.USER_PREFERRED_RESOLUTION_HEIGHT,

packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,7 @@ public class SecureSettings {
	Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,		Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
	Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,		Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
	Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED,		Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED,
			Settings.Secure.ADAPTIVE_CHARGING_ENABLED,
	Settings.Secure.ADAPTIVE_SLEEP,		Settings.Secure.ADAPTIVE_SLEEP,
	Settings.Secure.CAMERA_AUTOROTATE,		Settings.Secure.CAMERA_AUTOROTATE,
	Settings.Secure.AUTOFILL_SERVICE,		Settings.Secure.AUTOFILL_SERVICE,

packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -155,6 +155,7 @@ public class GlobalSettingsValidators {
	VALIDATORS.put(Global.DEVICE_CONFIG_SYNC_DISABLED, BOOLEAN_VALIDATOR);		VALIDATORS.put(Global.DEVICE_CONFIG_SYNC_DISABLED, BOOLEAN_VALIDATOR);
	VALIDATORS.put(Global.AUTOMATIC_POWER_SAVE_MODE, ANY_INTEGER_VALIDATOR);		VALIDATORS.put(Global.AUTOMATIC_POWER_SAVE_MODE, ANY_INTEGER_VALIDATOR);
	VALIDATORS.put(Global.ADVANCED_BATTERY_USAGE_AMOUNT, PERCENTAGE_INTEGER_VALIDATOR);		VALIDATORS.put(Global.ADVANCED_BATTERY_USAGE_AMOUNT, PERCENTAGE_INTEGER_VALIDATOR);
			VALIDATORS.put(Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, BOOLEAN_VALIDATOR);
	VALIDATORS.put(Global.POWER_BUTTON_LONG_PRESS_DURATION_MS, NONE_NEGATIVE_LONG_VALIDATOR);		VALIDATORS.put(Global.POWER_BUTTON_LONG_PRESS_DURATION_MS, NONE_NEGATIVE_LONG_VALIDATOR);

	VALIDATORS.put(Global.Wearable.HAS_PAY_TOKENS, BOOLEAN_VALIDATOR);		VALIDATORS.put(Global.Wearable.HAS_PAY_TOKENS, BOOLEAN_VALIDATOR);

packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -59,6 +59,7 @@ public class SecureSettingsValidators {
	VALIDATORS.put(Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, BOOLEAN_VALIDATOR);		VALIDATORS.put(Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, BOOLEAN_VALIDATOR);
	VALIDATORS.put(		VALIDATORS.put(
	Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, BOOLEAN_VALIDATOR);		Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, BOOLEAN_VALIDATOR);
			VALIDATORS.put(Secure.ADAPTIVE_CHARGING_ENABLED, BOOLEAN_VALIDATOR);
	VALIDATORS.put(Secure.ADAPTIVE_SLEEP, BOOLEAN_VALIDATOR);		VALIDATORS.put(Secure.ADAPTIVE_SLEEP, BOOLEAN_VALIDATOR);
	VALIDATORS.put(Secure.CAMERA_AUTOROTATE, BOOLEAN_VALIDATOR);		VALIDATORS.put(Secure.CAMERA_AUTOROTATE, BOOLEAN_VALIDATOR);
	VALIDATORS.put(Secure.AUTOFILL_SERVICE, NULLABLE_COMPONENT_NAME_VALIDATOR);		VALIDATORS.put(Secure.AUTOFILL_SERVICE, NULLABLE_COMPONENT_NAME_VALIDATOR);

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -110,7 +110,6 @@ public class SettingsBackupTest {
	newHashSet(		newHashSet(
	Settings.Global.ACTIVITY_MANAGER_CONSTANTS,		Settings.Global.ACTIVITY_MANAGER_CONSTANTS,
	Settings.Global.ACTIVITY_STARTS_LOGGING_ENABLED,		Settings.Global.ACTIVITY_STARTS_LOGGING_ENABLED,
	Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED,
	Settings.Global.ADB_ALLOWED_CONNECTION_TIME,		Settings.Global.ADB_ALLOWED_CONNECTION_TIME,
	Settings.Global.ADB_ENABLED,		Settings.Global.ADB_ENABLED,
	Settings.Global.ADB_WIFI_ENABLED,		Settings.Global.ADB_WIFI_ENABLED,