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

Commit 27ef1b40 authored by YUKAI HUNG's avatar YUKAI HUNG Committed by Android (Google) Code Review
Browse files

Merge "Backup AUTOMATIC_POWER_SAVE_MODE and ADVANCED_BATTERY_USAGE_AMOUNT"

parents d92c46df c315a75d

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

+2 −0
Original line number Diff line number Diff line
@@ -79,5 +79,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
@@ -143,6 +143,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);



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

        VALIDATORS.put(Global.Wearable.GMS_CHECKIN_TIMEOUT_MIN, ANY_INTEGER_VALIDATOR);

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

+0 −2
Original line number Diff line number Diff line
@@ -138,7 +138,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,
@@ -593,7 +592,6 @@ public class SettingsBackupTest { 
                    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.Wearable.HAS_PAY_TOKENS,

                    Settings.Global.Wearable.GMS_CHECKIN_TIMEOUT_MIN,

                    Settings.Global.Wearable.HOTWORD_DETECTION_ENABLED,