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

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

Browse Source 
Bug: 197237752
Test: atest CtsDumpsysHostTestCases:android.dumpsys.cts.BatteryStatsDumpsysTest#testBatterystatsOutput -- --abi arm64-v8a
Change-Id: I18a1b563a066bcabe686a12fd9c93d3838ed0d10
This commit is contained in:
Dmitri Plotnikov
2021-08-24 14:10:59 -07:00
parent 7058a51deb
commit 0312c36cc7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/os/SystemServicePowerCalculator.java
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) {