Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix divide-by-zero in noteModemControllerActivity

Browse Source 
Fixes: 267058279
Test: manual (while no radio activity "adb shell dumpsys battery unplug;
adb shell dumpsys batterystats; adb shell dumpsys batterystats;")

Change-Id: I8803aad1f38c2baa50c255d3d315d2c5880c9e33
This commit is contained in:
Michael Wachenschwanz
2023-02-02 14:16:19 -08:00
parent e4241197f5
commit 347553f47a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/power/stats/BatteryStatsImpl.java
View File

@@ -12076,11 +12076,16 @@ public class BatteryStatsImpl extends BatteryStats {
final SparseDoubleArray uidEstimatedConsumptionMah;
final long dataConsumedChargeUC;
if (consumedChargeUC > 0 && isMobileRadioEnergyConsumerSupportedLocked()) {
// Crudely attribute power consumption. Added (totalRadioDurationMs / 2) to the
// numerator for long rounding.
final long phoneConsumedChargeUC =
(consumedChargeUC * phoneOnDurationMs + totalRadioDurationMs / 2)
/ totalRadioDurationMs;
final long phoneConsumedChargeUC;
if (totalRadioDurationMs == 0) {
phoneConsumedChargeUC = 0;
} else {
// Crudely attribute power consumption. Added (totalRadioDurationMs / 2) to the
// numerator for long rounding.
phoneConsumedChargeUC =
(consumedChargeUC * phoneOnDurationMs + totalRadioDurationMs / 2)
/ totalRadioDurationMs;
}
dataConsumedChargeUC = consumedChargeUC - phoneConsumedChargeUC;
mGlobalEnergyConsumerStats.updateStandardBucket(