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

Commit f786c7fa authored by Hugh Chen's avatar Hugh Chen Committed by Android (Google) Code Review
Browse files

Merge "Add Settings.Global.ADVANCED_BATTERY_USAGE_AMOUNT"

parents 1ad9e57d e3fae2d4

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -14129,6 +14129,13 @@ public final class Settings { 
         */

        @SystemApi

        public static final String COMMON_CRITERIA_MODE = "common_criteria_mode";













        /**













         * The usage amount of advanced battery. The value is 0~100.













         *













         * @hide













         */













        public static final String ADVANCED_BATTERY_USAGE_AMOUNT = "advanced_battery_usage_amount";















    }





























    /**

























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



+2
−1




























Original line number
Diff line number
Diff line








@@ -579,7 +579,8 @@ public class SettingsBackupTest {













                    Settings.Global.MODEM_STACK_ENABLED_FOR_SLOT,















                    Settings.Global.POWER_BUTTON_LONG_PRESS,















                    Settings.Global.POWER_BUTTON_VERY_LONG_PRESS,













                    Settings.Global.INTEGRITY_CHECK_INCLUDES_RULE_PROVIDER);













                    Settings.Global.INTEGRITY_CHECK_INCLUDES_RULE_PROVIDER,













                    Settings.Global.ADVANCED_BATTERY_USAGE_AMOUNT);































    private static final Set<String> BACKUP_BLACKLISTED_SECURE_SETTINGS =















             newHashSet(