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

Commit 76d9649e authored by YUKAI HUNG's avatar YUKAI HUNG Committed by Automerger Merge Worker
Browse files

Merge "Backup AUTOMATIC_POWER_SAVE_MODE and ADVANCED_BATTERY_USAGE_AMOUNT"... 

Merge "Backup AUTOMATIC_POWER_SAVE_MODE and ADVANCED_BATTERY_USAGE_AMOUNT" into sc-v2-dev am: ae5d3b43

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

Change-Id: Ieca8d467a11287794ca489aefec01e5acdef94cd
parents ee4e466a ae5d3b43

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

+2 −0
Original line number Diff line number Diff line
@@ -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,

    };

}

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

+2 −0
Original line number Diff line number Diff line
@@ -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);

    }

}

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

+1 −3
Original line number Diff line number Diff line
@@ -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<String> BACKUP_DENY_LIST_SECURE_SETTINGS =

             newHashSet(