From 80595ac986cdffc8c8088975af56b39f0e64b46b Mon Sep 17 00:00:00 2001 From: Dmitri Plotnikov Date: Thu, 20 May 2021 16:57:01 -0700 Subject: [PATCH] Fix Modeled vs. Measured check in BatteryStatsViewer Bug: 162380414 Test: mp :BatteryStatsViewer && adb shell am start -n com.android.frameworks.core.batterystatsviewer/.BatteryConsumerPickerActivity Change-Id: Ic533d2da4333a459ab552b375cf1fab25bac3cd5 --- .../core/batterystatsviewer/BatteryConsumerData.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java index c2071357bbddd..0c7218efc3d83 100644 --- a/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java +++ b/core/tests/batterystatstests/BatteryStatsViewer/src/com/android/frameworks/core/batterystatsviewer/BatteryConsumerData.java @@ -124,7 +124,8 @@ public class BatteryConsumerData { for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) { final String metricTitle = getPowerMetricTitle(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, requestedBatteryConsumer.getConsumedPower(component), totalPowerByComponentMah[component] @@ -202,7 +203,8 @@ public class BatteryConsumerData { for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) { final String metricTitle = getPowerMetricTitle(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, deviceBatteryConsumer.getConsumedPower(component), appsBatteryConsumer.getConsumedPower(component)); @@ -237,8 +239,9 @@ public class BatteryConsumerData { private boolean isPowerProfileModelsOnly(BatteryConsumer batteryConsumer) { for (int component = 0; component < BatteryConsumer.POWER_COMPONENT_COUNT; component++) { - if (batteryConsumer.getPowerModel(component) - != BatteryConsumer.POWER_MODEL_POWER_PROFILE) { + final int powerModel = batteryConsumer.getPowerModel(component); + if (powerModel != BatteryConsumer.POWER_MODEL_POWER_PROFILE + && powerModel != BatteryConsumer.POWER_MODEL_UNDEFINED) { return false; } }