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

am c2a809b1: am ad3bc7f8: Fix a keyguard charging status

Browse Source 
* commit 'c2a809b1afae2077756fdf11af4ac5d466fa6d9a':
  Fix a keyguard charging status
This commit is contained in:
Adrian Roos
2014-11-04 14:33:14 +00:00
committed by Android Git Automerger
parent c0fabb0cb9 c2a809b1af
commit 78ac6b296d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -518,7 +518,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
* Determine whether the device is plugged in (USB, power, or wireless). * Determine whether the device is plugged in (USB, power, or wireless).
* @return true if the device is plugged in. * @return true if the device is plugged in.
*/ */
boolean isPluggedIn() { public boolean isPluggedIn() {
return plugged == BatteryManager.BATTERY_PLUGGED_AC return plugged == BatteryManager.BATTERY_PLUGGED_AC
|| plugged == BatteryManager.BATTERY_PLUGGED_USB || plugged == BatteryManager.BATTERY_PLUGGED_USB
|| plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS; || plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS;

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

@@ -162,8 +162,9 @@ public class KeyguardIndicationController {
KeyguardUpdateMonitorCallback mUpdateMonitor = new KeyguardUpdateMonitorCallback() { KeyguardUpdateMonitorCallback mUpdateMonitor = new KeyguardUpdateMonitorCallback() {
@Override @Override
public void onRefreshBatteryInfo(KeyguardUpdateMonitor.BatteryStatus status) { 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; || status.status == BatteryManager.BATTERY_STATUS_FULL;
mPowerPluggedIn = status.isPluggedIn() && isChargingOrFull;
mPowerCharged = status.isCharged(); mPowerCharged = status.isCharged();
updateIndication(); updateIndication();
} }