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

Merge "Fix divide-by-zero in noteModemControllerActivity"

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-08 01:18:36 +00:00
committed by Android (Google) Code Review
parent d30cf8ff7c 347553f47a
commit cc43a52f86
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

@@ -12084,11 +12084,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(