From bb9e57c958985cb04541a343bdb01c9f836258fb Mon Sep 17 00:00:00 2001 From: ykhung Date: Tue, 20 Jul 2021 08:23:24 +0800 Subject: [PATCH] Backup AUTOMATIC_POWER_SAVE_MODE and ADVANCED_BATTERY_USAGE_AMOUNT Starting with Android 12 QPR, start backing up this setting to restore user's pref across devices for Battery Saver and Battery Share feaature. Bug: 192523697 Test: atest SettingsBackupTest Merged-In: I2eaafec6704c0a0d2a2fb3c301fa9c904f7d3ac4 Change-Id: I2eaafec6704c0a0d2a2fb3c301fa9c904f7d3ac4 --- .../src/android/provider/settings/backup/GlobalSettings.java | 2 ++ .../settings/validators/GlobalSettingsValidators.java | 2 ++ .../test/src/android/provider/SettingsBackupTest.java | 4 +--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java index eb8196176034c..01ae1e915c8c2 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java @@ -76,5 +76,7 @@ public class GlobalSettings { Settings.Global.ARE_USER_DISABLED_HDR_FORMATS_ALLOWED, Settings.Global.DEVICE_CONFIG_SYNC_DISABLED, Settings.Global.POWER_BUTTON_LONG_PRESS, + Settings.Global.AUTOMATIC_POWER_SAVE_MODE, + Settings.Global.ADVANCED_BATTERY_USAGE_AMOUNT, }; } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index 5220a04d73e68..3c7d7a8e890c2 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -140,6 +140,8 @@ public class GlobalSettingsValidators { /* last= */Global.ONE_HANDED_KEYGUARD_SIDE_RIGHT)); VALIDATORS.put(Global.DISABLE_WINDOW_BLURS, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.DEVICE_CONFIG_SYNC_DISABLED, BOOLEAN_VALIDATOR); + VALIDATORS.put(Global.AUTOMATIC_POWER_SAVE_MODE, ANY_INTEGER_VALIDATOR); + VALIDATORS.put(Global.ADVANCED_BATTERY_USAGE_AMOUNT, PERCENTAGE_INTEGER_VALIDATOR); } } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 3297937e3e752..9362a18862151 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -137,7 +137,6 @@ public class SettingsBackupTest { Settings.Global.AUTOFILL_LOGGING_LEVEL, Settings.Global.AUTOFILL_MAX_PARTITIONS_SIZE, Settings.Global.AUTOFILL_MAX_VISIBLE_DATASETS, - Settings.Global.AUTOMATIC_POWER_SAVE_MODE, Settings.Global.AVERAGE_TIME_TO_DISCHARGE, Settings.Global.BATTERY_CHARGING_STATE_UPDATE_DELAY, Settings.Global.BATTERY_ESTIMATES_LAST_UPDATE_TIME, @@ -592,8 +591,7 @@ public class SettingsBackupTest { Settings.Global.INTEGRITY_CHECK_INCLUDES_RULE_PROVIDER, Settings.Global.CACHED_APPS_FREEZER_ENABLED, Settings.Global.APP_INTEGRITY_VERIFICATION_TIMEOUT, - Settings.Global.KEY_CHORD_POWER_VOLUME_UP, - Settings.Global.ADVANCED_BATTERY_USAGE_AMOUNT); + Settings.Global.KEY_CHORD_POWER_VOLUME_UP); private static final Set BACKUP_DENY_LIST_SECURE_SETTINGS = newHashSet(