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

Merge "Fix Modeled vs. Measured check in BatteryStatsViewer" into sc-dev am: ef6dd9b138

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14667209

Change-Id: I6bf904e814b4fa15722b189f8ac21d5c2e43dd4f
This commit is contained in:
Dmitri Plotnikov
2021-05-24 20:09:20 +00:00
committed by Automerger Merge Worker
parent 73fcaf480a ef6dd9b138
commit 8c3415d358
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java
View File

@@ -124,7 +124,8 @@ public class BatteryConsumerData {
for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) { for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) {
final String metricTitle = getPowerMetricTitle(component); final String metricTitle = getPowerMetricTitle(component);
final int powerModel = requestedBatteryConsumer.getPowerModel(component); final int powerModel = requestedBatteryConsumer.getPowerModel(component);
if (powerModel == BatteryConsumer.POWER_MODEL_POWER_PROFILE) { if (powerModel == BatteryConsumer.POWER_MODEL_POWER_PROFILE
|| powerModel == BatteryConsumer.POWER_MODEL_UNDEFINED) {
addEntry(metricTitle, EntryType.UID_POWER_MODELED, addEntry(metricTitle, EntryType.UID_POWER_MODELED,
requestedBatteryConsumer.getConsumedPower(component), requestedBatteryConsumer.getConsumedPower(component),
totalPowerByComponentMah[component] totalPowerByComponentMah[component]
@@ -202,7 +203,8 @@ public class BatteryConsumerData {
for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) { for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) {
final String metricTitle = getPowerMetricTitle(component); final String metricTitle = getPowerMetricTitle(component);
final int powerModel = deviceBatteryConsumer.getPowerModel(component); final int powerModel = deviceBatteryConsumer.getPowerModel(component);
if (powerModel == BatteryConsumer.POWER_MODEL_POWER_PROFILE) { if (powerModel == BatteryConsumer.POWER_MODEL_POWER_PROFILE
|| powerModel == BatteryConsumer.POWER_MODEL_UNDEFINED) {
addEntry(metricTitle, EntryType.DEVICE_POWER_MODELED, addEntry(metricTitle, EntryType.DEVICE_POWER_MODELED,
deviceBatteryConsumer.getConsumedPower(component), deviceBatteryConsumer.getConsumedPower(component),
appsBatteryConsumer.getConsumedPower(component)); appsBatteryConsumer.getConsumedPower(component));
@@ -237,8 +239,9 @@ public class BatteryConsumerData {
private boolean isPowerProfileModelsOnly(BatteryConsumer batteryConsumer) { private boolean isPowerProfileModelsOnly(BatteryConsumer batteryConsumer) {
for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) { for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) {
if (batteryConsumer.getPowerModel(component) final int powerModel = batteryConsumer.getPowerModel(component);
!= BatteryConsumer.POWER_MODEL_POWER_PROFILE) { if (powerModel != BatteryConsumer.POWER_MODEL_POWER_PROFILE
&& powerModel != BatteryConsumer.POWER_MODEL_UNDEFINED) {
return false; return false;
} }
} }