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

This commit is contained in:
TreeHugger Robot
2019-04-05 01:00:22 +00:00
committed by Android (Google) Code Review

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 // 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 // trigger from spamming users by only showing low/critical warnings once per cycle
if (currentSnapshot.getTimeRemainingMillis() if (currentSnapshot.getTimeRemainingMillis()
<= currentSnapshot.getSevereLevelThreshold() <= currentSnapshot.getSevereThresholdMillis()
|| currentSnapshot.getBatteryLevel() <= mLowBatteryReminderLevels[1]) { || currentSnapshot.getBatteryLevel()
<= currentSnapshot.getSevereLevelThreshold()) {
mSevereWarningShownThisChargeCycle = true; mSevereWarningShownThisChargeCycle = true;
mLowWarningShownThisChargeCycle = true; mLowWarningShownThisChargeCycle = true;
if (DEBUG) { if (DEBUG) {