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

Merge "Send battery low intent when battery warning boundary changed"

Browse Source
This commit is contained in:
Jing Ji
2020-03-09 18:37:50 +00:00
committed by Gerrit Code Review
parent cfc0804182 4187603eda
commit 7d8f1a768a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,6 +165,7 @@ public final class BatteryService extends SystemService {
private int mLastInvalidCharger; private int mLastInvalidCharger;
private int mLowBatteryWarningLevel; private int mLowBatteryWarningLevel;
private int mLastLowBatteryWarningLevel;
private int mLowBatteryCloseWarningLevel; private int mLowBatteryCloseWarningLevel;
private int mShutdownBatteryTemperature; private int mShutdownBatteryTemperature;
@@ -313,6 +314,7 @@ public final class BatteryService extends SystemService {
final ContentResolver resolver = mContext.getContentResolver(); final ContentResolver resolver = mContext.getContentResolver();
int defWarnLevel = mContext.getResources().getInteger( int defWarnLevel = mContext.getResources().getInteger(
com.android.internal.R.integer.config_lowBatteryWarningLevel); com.android.internal.R.integer.config_lowBatteryWarningLevel);
mLastLowBatteryWarningLevel = mLowBatteryWarningLevel;
mLowBatteryWarningLevel = Settings.Global.getInt(resolver, mLowBatteryWarningLevel = Settings.Global.getInt(resolver,
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, defWarnLevel); Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, defWarnLevel);
if (mLowBatteryWarningLevel == 0) { if (mLowBatteryWarningLevel == 0) {
@@ -357,7 +359,8 @@ public final class BatteryService extends SystemService {
return !plugged return !plugged
&& mHealthInfo.batteryStatus != BatteryManager.BATTERY_STATUS_UNKNOWN && mHealthInfo.batteryStatus != BatteryManager.BATTERY_STATUS_UNKNOWN
&& mHealthInfo.batteryLevel <= mLowBatteryWarningLevel && mHealthInfo.batteryLevel <= mLowBatteryWarningLevel
&& (oldPlugged || mLastBatteryLevel > mLowBatteryWarningLevel); && (oldPlugged || mLastBatteryLevel > mLowBatteryWarningLevel
|| mHealthInfo.batteryLevel > mLastLowBatteryWarningLevel);
} }
private boolean shouldShutdownLocked() { private boolean shouldShutdownLocked() {