diff options
| author | Adrian Roos <roosa@google.com> | 2014-10-30 18:29:38 +0100 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2014-11-04 14:18:16 +0000 |
| commit | ad3bc7f878ace1a0eb6f73466d55d9d7b060e48c (patch) | |
| tree | 799a8fbf9ffa3f7e6ef822aec32ed9bb595e19ea | |
| parent | c0f0a74762f7b3651d0fcd8371e9eb0c84779b1a (diff) | |
| download | frameworks_base-ad3bc7f878ace1a0eb6f73466d55d9d7b060e48c.zip frameworks_base-ad3bc7f878ace1a0eb6f73466d55d9d7b060e48c.tar.gz frameworks_base-ad3bc7f878ace1a0eb6f73466d55d9d7b060e48c.tar.bz2 | |
Fix a keyguard charging status
Fixes a bug where the keyguard was showing
a charging state even though the device was
not plugged in.
Bug: 18166083
Change-Id: I85a2cda674ffdafb37df70598f4028414a639def
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index 1c6dc2c..aa5819e 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -518,7 +518,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { * Determine whether the device is plugged in (USB, power, or wireless). * @return true if the device is plugged in. */ - boolean isPluggedIn() { + public boolean isPluggedIn() { return plugged == BatteryManager.BATTERY_PLUGGED_AC || plugged == BatteryManager.BATTERY_PLUGGED_USB || plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index ce35e4b..992aa9f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -162,8 +162,9 @@ public class KeyguardIndicationController { KeyguardUpdateMonitorCallback mUpdateMonitor = new KeyguardUpdateMonitorCallback() { @Override public void onRefreshBatteryInfo(KeyguardUpdateMonitor.BatteryStatus status) { - mPowerPluggedIn = status.status == BatteryManager.BATTERY_STATUS_CHARGING + boolean isChargingOrFull = status.status == BatteryManager.BATTERY_STATUS_CHARGING || status.status == BatteryManager.BATTERY_STATUS_FULL; + mPowerPluggedIn = status.isPluggedIn() && isChargingOrFull; mPowerCharged = status.isCharged(); updateIndication(); } |