commit 415f8b32e82d13d3778a853b4722192842b3fc8b
author Ying Wai (Daniel) Fan <danfan@google.com> Tue Jan 31 22:00:10 2017 -0800
committer Aaron Whyte <awhyte@google.com> Mon Feb 06 18:20:40 2017 +0000
tree 477ffd8a5c7b348e1a25b81c706f007fcf01e47e
parent 1f8f29968b13b64ef4f3f01e37d073fec03af6f2

Prevent division-by-zero error when calculating battery capacity.

Bug: 34255953
Change-Id: Ie072cd5dc26faf17e8ab46ea0795750396f087c2
Fixes: 34255953
Test: formula change CL. No existing unit tests found.

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));
                 }