Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3619c4bc authored by Michael Wachenschwanz's avatar Michael Wachenschwanz
Browse files

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

Fixes: 262258554
Test: atest
CtsDumpsysHostTestCases:android.dumpsys.cts.BatteryStatsDumpsysTest#testBatterystatsOutput
(on a non ODPM enabled device)

Change-Id: Iae006a2fd74f456c0ec4ca6e9c33d4f80fd48f9c
parent e4241197

services/core/java/com/android/server/power/stats/MobileRadioPowerCalculator.java

+4 −2
Original line number Diff line number Diff line
@@ -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.

            if (totalActiveDurationMs != 0) {

                total.remainingPowerMah +=

                        (totalActivePowerMah * total.remainingDurationMs) / totalActiveDurationMs;

            }



            // Calculate the inactive modem power consumption.

            final BatteryStats.ControllerActivityCounter modemActivity =