Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad3bc7f8 authored by Adrian Roos's avatar Adrian Roos
Browse files

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
parent c0f0a747

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+2 −1
Original line number Diff line number Diff line
@@ -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();

        }