Merge "Don't show low battery tip when estimation is zero"

2018-06-19 18:42:43 +00:00
parent 3df8494f08 efb1bbd59d
commit b86438768c
2 changed files with 8 additions and 1 deletions
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetector.java
@@ -47,7 +47,7 @@ public class LowBatteryDetector implements BatteryTipDetector {
    public BatteryTip detect() {
        final boolean powerSaveModeOn = mPowerManager.isPowerSaveMode();
        final boolean lowBattery = mBatteryInfo.batteryLevel <= mWarningLevel
-                || (mBatteryInfo.discharging
+                || (mBatteryInfo.discharging && mBatteryInfo.remainingTimeUs != 0
                && mBatteryInfo.remainingTimeUs < TimeUnit.HOURS.toMicros(mPolicy.lowBatteryHour));

        int state = BatteryTip.StateType.INVISIBLE;