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

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

Browse Source 
This reverts commit 965419af5d.

Bug: 71707409
Test: Manual test

Change-Id: I4f1c46183189b454bc981a65b992b80668f7a59a
This commit is contained in:
Makoto Onuki
2018-01-16 12:22:07 -08:00
parent 66792c4833
commit 018b5fa530
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,15 +293,10 @@ public final class BatteryService extends SystemService {
private void updateBatteryWarningLevelLocked() {
final ContentResolver resolver = mContext.getContentResolver();
final int defWarnLevel = mContext.getResources().getInteger(
int defWarnLevel = mContext.getResources().getInteger(
com.android.internal.R.integer.config_lowBatteryWarningLevel);
final int lowPowerModeTriggerLevel = Settings.Global.getInt(resolver,
mLowBatteryWarningLevel = Settings.Global.getInt(resolver,
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, defWarnLevel);
// NOTE: Keep the logic in sync with PowerUI.java in systemUI.
// TODO: Propagate this value from BatteryService to system UI, really.
mLowBatteryWarningLevel = Math.min(defWarnLevel, lowPowerModeTriggerLevel);
if (mLowBatteryWarningLevel == 0) {
mLowBatteryWarningLevel = defWarnLevel;
}