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

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

Browse Source
This commit is contained in:
Makoto Onuki
2018-01-16 22:25:51 +00:00
committed by Android (Google) Code Review
parent a30e47e244 018b5fa530
commit 7b71dfe2f6
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;
}