Merge "Make isBatteryDefender a method for flexibility." into main (2488f767) · Commits · e / os / android_frameworks_base

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -199,12 +199,14 @@ public class KeyguardIndicationController {
		protected boolean mPowerPluggedInWired;
		protected boolean mPowerPluggedInWireless;
		protected boolean mPowerPluggedInDock;
		protected int mChargingSpeed;

		private boolean mPowerCharged;
		/** Whether the battery defender is triggered. */
		private boolean mBatteryDefender;
		/** Whether the battery defender is triggered with the device plugged. */
		private boolean mEnableBatteryDefender;
		private boolean mIncompatibleCharger;
		protected int mChargingSpeed;
		private int mChargingWattage;
		private int mBatteryLevel;
		private boolean mBatteryPresent = true;
		@@ -1244,7 +1246,7 @@ public class KeyguardIndicationController {
		mChargingSpeed = status.getChargingSpeed(mContext);
		mBatteryLevel = status.level;
		mBatteryPresent = status.present;
		mBatteryDefender = status.isBatteryDefender();
		mBatteryDefender = isBatteryDefender(status);
		// when the battery is overheated, device doesn't charge so only guard on pluggedIn:
		mEnableBatteryDefender = mBatteryDefender && status.isPluggedIn();
		mIncompatibleCharger = status.incompatibleCharger.orElse(false);
		@@ -1516,6 +1518,11 @@ public class KeyguardIndicationController {
		return mPowerPluggedIn;
		}

		/** Return true if the device is under the battery defender mode. */
		protected boolean isBatteryDefender(BatteryStatus status) {
		return status.isBatteryDefender();
		}

		private boolean isCurrentUser(int userId) {
		return getCurrentUser() == userId;
		}