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

Merge "Adjust total consumed power to avoid double-counting" into sc-dev

Browse Source
This commit is contained in:
Dmitri Plotnikov
2021-04-01 17:00:30 +00:00
committed by Android (Google) Code Review
parent b012745bc0 ff6c7f864c
commit 8b5679d534
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/BatteryUsageStats.java
View File

@@ -74,7 +74,7 @@ public final class BatteryUsageStats implements Parcelable {
for (int i = 0; i < systemBatteryConsumerCount; i++) { for (int i = 0; i < systemBatteryConsumerCount; i++) {
final SystemBatteryConsumer consumer = final SystemBatteryConsumer consumer =
builder.mSystemBatteryConsumerBuilders.valueAt(i).build(); builder.mSystemBatteryConsumerBuilders.valueAt(i).build();
totalPower += consumer.getConsumedPower(); totalPower += consumer.getConsumedPower() - consumer.getPowerConsumedByApps();
mSystemBatteryConsumers.add(consumer); mSystemBatteryConsumers.add(consumer);
} }

5
core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsTest.java
View File

@@ -103,7 +103,10 @@ public class BatteryUsageStatsTest {
} }
public void validateBatteryUsageStats(BatteryUsageStats batteryUsageStats) { public void validateBatteryUsageStats(BatteryUsageStats batteryUsageStats) {
assertThat(batteryUsageStats.getConsumedPower()).isEqualTo(21500); // Camera: (10100 + 10200) - 20000 (consumed by apps) = 300
// App: 300 + 400 + 500 = 1200
// Total: 1500
assertThat(batteryUsageStats.getConsumedPower()).isEqualTo(1500);
assertThat(batteryUsageStats.getDischargePercentage()).isEqualTo(20); assertThat(batteryUsageStats.getDischargePercentage()).isEqualTo(20);
assertThat(batteryUsageStats.getDischargedPowerRange().getLower()).isEqualTo(1000); assertThat(batteryUsageStats.getDischargedPowerRange().getLower()).isEqualTo(1000);
assertThat(batteryUsageStats.getDischargedPowerRange().getUpper()).isEqualTo(2000); assertThat(batteryUsageStats.getDischargedPowerRange().getUpper()).isEqualTo(2000);