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

Cap the low battery threshold at config_lowBatteryWarningLevel (=15)

Browse Source 
Currently it doesn't matter because LOW_POWER_MODE_TRIGGER_LEVEL can be 15%
at most and config_lowBatteryWarningLevel is 15, but because
we'll allow bigger LOW_POWER_MODE_TRIGGER_LEVEL, we don't want to do
the low battery warning at a battery level too high.

Bug: 71707409
Test: manual test with "dumpsys battery unplug" and "dumpsys battery set level XX"
Change-Id: Ibd3646decef243bbed21c148134ab1d3930bea14
This commit is contained in:
Makoto Onuki
2018-01-09 14:43:06 -08:00
parent 229d2cdba3
commit 965419af5d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/BatteryService.java
View File

@@ -293,10 +293,13 @@ public final class BatteryService extends SystemService {
private void updateBatteryWarningLevelLocked() {
final ContentResolver resolver = mContext.getContentResolver();
int defWarnLevel = mContext.getResources().getInteger(
final int defWarnLevel = mContext.getResources().getInteger(
com.android.internal.R.integer.config_lowBatteryWarningLevel);
mLowBatteryWarningLevel = Settings.Global.getInt(resolver,
final int lowPowerModeTriggerLevel = Settings.Global.getInt(resolver,
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, defWarnLevel);
mLowBatteryWarningLevel = Math.min(defWarnLevel, lowPowerModeTriggerLevel);
if (mLowBatteryWarningLevel == 0) {
mLowBatteryWarningLevel = defWarnLevel;
}