Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80595ac9 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

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
parent 186fbcc2

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

+7 −4
Original line number Diff line number Diff line
@@ -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;

            }

        }