Merge "Prevent zero-division in the absence of measured system server drain"

This commit is contained in:
Dmitri Plotnikov
2021-08-25 00:33:55 +00:00
committed by Android (Google) Code Review

View File

@@ -175,8 +175,11 @@ public class SystemServicePowerCalculator extends PowerCalculator {
final double systemUidModeledPowerMah = mCpuPowerCalculator.calculateUidModeledPowerMah(
systemUid, BatteryStats.STATS_SINCE_CHARGED);
return uCtoMah(consumptionUC) * systemServiceModeledPowerMah
/ systemUidModeledPowerMah;
if (systemUidModeledPowerMah > 0) {
return uCtoMah(consumptionUC) * systemServiceModeledPowerMah / systemUidModeledPowerMah;
} else {
return 0;
}
}
private double calculatePowerUsingPowerProfile(BatteryStats batteryStats) {