Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Settings.Global.ADVANCED_BATTERY_USAGE_AMOUNT"

Browse Source
This commit is contained in:
Hugh Chen
2020-02-19 10:20:28 +00:00
committed by Android (Google) Code Review
parent 1ad9e57d97 e3fae2d4b9
commit f786c7fa6c
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/provider/Settings.java
View File

@@ -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";
}
/**

3
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -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(