summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Makoto Onuki <omakoto@google.com> 2018-01-16 12:22:07 -0800
committer Makoto Onuki <omakoto@google.com> 2018-01-16 12:22:21 -0800
commit018b5fa530522d7bd0258ef86dc24cd9aa3f7090 (patch)
tree1112518ca9bca2b0862603ddb4aecd113454ce85
parent66792c4833f2c5db584bb3fc40ac494035319289 (diff)
Revert "Cap the low battery threshold at config_lowBatteryWarningLevel (=15)"
This reverts commit 965419af5da6900141d66fbccfe96928603aed6c. Bug: 71707409 Test: Manual test Change-Id: I4f1c46183189b454bc981a65b992b80668f7a59a
-rw-r--r--services/core/java/com/android/server/BatteryService.java9
1 files changed, 2 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java
index af0b66daad50..04d292fa1ae4 100644
--- a/services/core/java/com/android/server/BatteryService.java
+++ b/services/core/java/com/android/server/BatteryService.java
@@ -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;
}