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

Commit cc43a52f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix divide-by-zero in noteModemControllerActivity"

parents d30cf8ff 347553f4

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

+10 −5
Original line number Diff line number Diff line
@@ -12084,11 +12084,16 @@ public class BatteryStatsImpl extends BatteryStats { 
            final SparseDoubleArray uidEstimatedConsumptionMah;

            final long dataConsumedChargeUC;

            if (consumedChargeUC > 0 && isMobileRadioEnergyConsumerSupportedLocked()) {

                final long phoneConsumedChargeUC;

                if (totalRadioDurationMs == 0) {

                    phoneConsumedChargeUC = 0;

                } else {

                    // Crudely attribute power consumption. Added (totalRadioDurationMs / 2) to the

                    // numerator for long rounding.

                final long phoneConsumedChargeUC =

                    phoneConsumedChargeUC =

                            (consumedChargeUC * phoneOnDurationMs + totalRadioDurationMs / 2)

                                    / totalRadioDurationMs;

                }

                dataConsumedChargeUC = consumedChargeUC - phoneConsumedChargeUC;















                mGlobalEnergyConsumerStats.updateStandardBucket(