Merge "Prevent zero-division in the absence of measured system server drain"
This commit is contained in:
committed by
Android (Google) Code Review
commit
13b0aa2aef
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user