summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author YK Hung <ykhung@google.com> 2024-06-29 08:50:10 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-06-29 08:50:10 +0000
commit3250e92e382b0bd7d9c20bf76586facde62b7a2f (patch)
tree01f0a658a5b28478f274f8c32aa09b7e0cfb55af
parent362d4ac464fa4999da098f464fab5dd7ac0de579 (diff)
parent45de7bc683e093474cc850164d558b678cf9f035 (diff)
Merge "Make isPowerPluggedIn a method for flexibility." into main
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 2f3fc729464e..c1eb8bcfa493 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -1276,7 +1276,7 @@ public class KeyguardIndicationController {
mPowerPluggedInWired = status.isPluggedInWired() && isChargingOrFull;
mPowerPluggedInWireless = status.isPluggedInWireless() && isChargingOrFull;
mPowerPluggedInDock = status.isPluggedInDock() && isChargingOrFull;
- mPowerPluggedIn = status.isPluggedIn() && isChargingOrFull;
+ mPowerPluggedIn = isPowerPluggedIn(status, isChargingOrFull);
mPowerCharged = status.isCharged();
mChargingWattage = status.maxChargingWattage;
mChargingSpeed = status.getChargingSpeed(mContext);
@@ -1562,6 +1562,11 @@ public class KeyguardIndicationController {
return status.isBatteryDefender();
}
+ /** Return true if the device has power plugged in. */
+ protected boolean isPowerPluggedIn(BatteryStatus status, boolean isChargingOrFull) {
+ return status.isPluggedIn() && isChargingOrFull;
+ }
+
private boolean isCurrentUser(int userId) {
return getCurrentUser() == userId;
}