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

Commit 4ca581ca authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Fix initialization timing for CPU energy consumer config 

Bug: 397780139
Flag: EXEMPT bugfix
Test: atest PowerStatsTests;atest PowerStatsTestsRavenwood
Change-Id: I5df9760211310a8f4d21b7a2938838f86fce9843
parent 1be4df13

services/core/java/com/android/server/power/stats/processor/CpuPowerStatsProcessor.java

+6 −3
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ class CpuPowerStatsProcessor extends PowerStatsProcessor { 
        mTmpUidStatsArray = new long[descriptor.uidStatsArrayLength];



        mWakelockDescriptor = null;



        initEnergyConsumerToPowerBracketMaps();

    }



    /**
@@ -157,9 +159,6 @@ class CpuPowerStatsProcessor extends PowerStatsProcessor { 


        if (mPlan == null) {

            mPlan = new PowerEstimationPlan(stats.getConfig());

            if (mStatsLayout.getEnergyConsumerCount() != 0) {

                initEnergyConsumerToPowerBracketMaps();

            }

        }



        Intermediates intermediates = new Intermediates();
@@ -255,6 +254,10 @@ class CpuPowerStatsProcessor extends PowerStatsProcessor { 
     */

    private void initEnergyConsumerToPowerBracketMaps() {

        int energyConsumerCount = mStatsLayout.getEnergyConsumerCount();

        if (energyConsumerCount == 0) {

            return;

        }



        int powerBracketCount = mStatsLayout.getCpuPowerBracketCount();



        mEnergyConsumerToCombinedEnergyConsumerMap = new int[energyConsumerCount];