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

Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev

Browse Source
This commit is contained in:
Adrian Roos
2015-07-22 23:22:42 +00:00
committed by Android (Google) Code Review
parent 9478ddfa11 76dc5a51cd
commit 58adc7ad48
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -1232,6 +1232,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
if (!nowPluggedIn && current.isBatteryLow() && current.level != old.level) {
return true;
}
// change in charging current while plugged in
if (nowPluggedIn && current.maxChargingCurrent != old.maxChargingCurrent) {
return true;
}
return false;
}

2
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -164,7 +164,7 @@ public class KeyguardIndicationController {
if (mPowerPluggedIn) {
String indication = computePowerIndication();
if (DEBUG_CHARGING_CURRENT) {
indication = indication + mChargingCurrent;
indication += ", " + (mChargingCurrent / 1000) + " mA";
}
return indication;
}

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

@@ -120,6 +120,7 @@ public final class BatteryService extends SystemService {
private int mLastBatteryVoltage;
private int mLastBatteryTemperature;
private boolean mLastBatteryLevelCritical;
private int mLastMaxChargingCurrent;
private int mInvalidCharger;
private int mLastInvalidCharger;
@@ -354,6 +355,7 @@ public final class BatteryService extends SystemService {
mPlugType != mLastPlugType ||
mBatteryProps.batteryVoltage != mLastBatteryVoltage ||
mBatteryProps.batteryTemperature != mLastBatteryTemperature ||
mBatteryProps.maxChargingCurrent != mLastMaxChargingCurrent ||
mInvalidCharger != mLastInvalidCharger)) {
if (mPlugType != mLastPlugType) {
@@ -480,6 +482,7 @@ public final class BatteryService extends SystemService {
mLastPlugType = mPlugType;
mLastBatteryVoltage = mBatteryProps.batteryVoltage;
mLastBatteryTemperature = mBatteryProps.batteryTemperature;
mLastMaxChargingCurrent = mBatteryProps.maxChargingCurrent;
mLastBatteryLevelCritical = mBatteryLevelCritical;
mLastInvalidCharger = mInvalidCharger;
}