commit 50fa8ad424d53e451f654bae6b1d2630634d5150
author Aaron Whyte <awhyte@google.com> Mon Feb 06 22:49:32 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 06 22:49:35 2017 +0000
tree 381d3d2529571c398b8fb532e23e44322df8d40c
parent b06c3ed79ee6e710b05577893a0407eaf2712c61
parent 415f8b32e82d13d3778a853b4722192842b3fc8b

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

core/java/com/android/internal/os/BatteryStatsImpl.java

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index c0bf825..8aaa7bc 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -9594,7 +9594,7 @@
                 }
                 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));
                 }