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

BatteryService: don't set battery low or critical states if no battery

Browse Source 
If device has no battery then never set states "battery low" or
"battery critical".

Bug: 34507420
Test: manual: inspection (with hack to disappear the battery device)
Change-Id: I1eee79032507121de2fa7bf29d1359a29f21d3d0
This commit is contained in:
Todd Poynor
2017-12-08 10:44:40 -08:00
parent 1acf06a62a
commit b41df4423e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -421,7 +421,9 @@ public final class BatteryService extends SystemService {
boolean logOutlier = false;
long dischargeDuration = 0;
mBatteryLevelCritical = (mHealthInfo.batteryLevel <= mCriticalBatteryLevel);
mBatteryLevelCritical =
mHealthInfo.batteryStatus != BatteryManager.BATTERY_STATUS_UNKNOWN
&& mHealthInfo.batteryLevel <= mCriticalBatteryLevel;
if (mHealthInfo.chargerAcOnline) {
mPlugType = BatteryManager.BATTERY_PLUGGED_AC;
} else if (mHealthInfo.chargerUsbOnline) {
@@ -509,6 +511,8 @@ public final class BatteryService extends SystemService {
if (!mBatteryLevelLow) {
// Should we now switch in to low battery mode?
if (mPlugType == BATTERY_PLUGGED_NONE
&& mHealthInfo.batteryStatus !=
BatteryManager.BATTERY_STATUS_UNKNOWN
&& mHealthInfo.batteryLevel <= mLowBatteryWarningLevel) {
mBatteryLevelLow = true;
}