Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev

2017-02-06 22:49:32 +00:00
parent b06c3ed79e 415f8b32e8
commit 50fa8ad424
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -9594,7 +9594,7 @@ public class BatteryStatsImpl extends BatteryStats {
                }
                doWrite = true;
                resetAllStatsLocked();
-                if (chargeUAh > 0) {
+                if (chargeUAh > 0 && level > 0) {
                    // Only use the reported coulomb charge value if it is supported and reported.
                    mEstimatedBatteryCapacity = (int) ((chargeUAh / 1000) / (level / 100.0));
                }