Merge "Fix mixed up variable in triggering logic" into qt-dev

am: 0139ae1581

Change-Id: I9c3ab49350cd3a569d2ac80ffa48e89948ec3822
This commit is contained in:
Salvador Martinez
2019-04-04 19:16:23 -07:00
committed by android-build-merger

View File

@@ -341,8 +341,9 @@ public class PowerUI extends SystemUI {
// mark if we've already shown a warning this cycle. This will prevent the notification
// trigger from spamming users by only showing low/critical warnings once per cycle
if (currentSnapshot.getTimeRemainingMillis()
<= currentSnapshot.getSevereLevelThreshold()
|| currentSnapshot.getBatteryLevel() <= mLowBatteryReminderLevels[1]) {
<= currentSnapshot.getSevereThresholdMillis()
|| currentSnapshot.getBatteryLevel()
<= currentSnapshot.getSevereLevelThreshold()) {
mSevereWarningShownThisChargeCycle = true;
mLowWarningShownThisChargeCycle = true;
if (DEBUG) {