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

Commit 8c3415d3 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I6bf904e814b4fa15722b189f8ac21d5c2e43dd4f
parents 73fcaf48 ef6dd9b1

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;

            }

        }