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

Merge "Cap the low battery threshold at config_lowBatteryWarningLevel (=15)"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-11 01:14:35 +00:00
committed by Android (Google) Code Review
parent ac3dbf4828 965419af5d
commit 7ae96a6dd6
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;
}