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

Keep PowerUI low-battery logic in sync with BatteryService.

Browse Source 
BatteryService has been updated already.

Bug: 71707409
Test: Manual test with dumpsys activity service com.android.systemui/.SystemUIService

Change-Id: I5a54a209b4929bf70a665e3b539a63d06eca61d4
This commit is contained in:
Makoto Onuki
2018-01-11 14:48:20 -08:00
parent 422a67987f
commit 4a9036bfd9
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/power/PowerUI.java
View File

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

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

@@ -298,6 +298,8 @@ public final class BatteryService extends SystemService {
final int lowPowerModeTriggerLevel = 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) {