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

Commit c0b8c51d authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Fix NullPointerException for devices without ODPM 

Bug: 315222709
Test: atest PowerStatsTests
Change-Id: I512f2640906595b28b7d0eea5683eaff10ab7e76
parent 1dfd11dd

services/core/java/com/android/server/power/stats/CpuPowerStatsCollector.java

+1 −4
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class CpuPowerStatsCollector extends PowerStatsCollector { 
    private final SparseArray<UidStats> mUidStats = new SparseArray<>();

    private boolean mIsPerUidTimeInStateSupported;

    private PowerStatsInternal mPowerStatsInternal;

    private int[] mCpuEnergyConsumerIds;

    private int[] mCpuEnergyConsumerIds = new int[0];

    private PowerStats.Descriptor mPowerStatsDescriptor;

    // Reusable instance

    private PowerStats mCpuPowerStats;
@@ -286,8 +286,6 @@ public class CpuPowerStatsCollector extends PowerStatsCollector { 


        if (mPowerStatsInternal != null) {

            readCpuEnergyConsumerIds();

        } else {

            mCpuEnergyConsumerIds = new int[0];

        }



        int cpuScalingStepCount = mCpuScalingPolicies.getScalingStepCount();
@@ -320,7 +318,6 @@ public class CpuPowerStatsCollector extends PowerStatsCollector { 
    private void readCpuEnergyConsumerIds() {

        EnergyConsumer[] energyConsumerInfo = mPowerStatsInternal.getEnergyConsumerInfo();

        if (energyConsumerInfo == null) {

            mCpuEnergyConsumerIds = new int[0];

            return;

        }