Merge "Fix divide-by-zero in mobile radio remaining power calculation"

2023-02-08 01:20:28 +00:00
parent cc43a52f86 3619c4bc23
commit 444098008d
1 changed files with 4 additions and 2 deletions
--- a/services/core/java/com/android/server/power/stats/MobileRadioPowerCalculator.java
+++ b/services/core/java/com/android/server/power/stats/MobileRadioPowerCalculator.java
@@ -264,8 +264,10 @@ public class MobileRadioPowerCalculator extends PowerCalculator {
            if (total.remainingPowerMah < 0) total.remainingPowerMah = 0;
        } else {
            // Smear unattributed active time and add it to the remaining power consumption.
-            total.remainingPowerMah +=
-                    (totalActivePowerMah * total.remainingDurationMs) / totalActiveDurationMs;
+            if (totalActiveDurationMs != 0) {
+                total.remainingPowerMah +=
+                        (totalActivePowerMah * total.remainingDurationMs) / totalActiveDurationMs;
+            }

            // Calculate the inactive modem power consumption.
            final BatteryStats.ControllerActivityCounter modemActivity =