Merge "Fix NullPointerException for devices without ODPM" into main
diff --git a/services/core/java/com/android/server/power/stats/CpuPowerStatsCollector.java b/services/core/java/com/android/server/power/stats/CpuPowerStatsCollector.java
index 4442845..1af1271 100644
--- a/services/core/java/com/android/server/power/stats/CpuPowerStatsCollector.java
+++ b/services/core/java/com/android/server/power/stats/CpuPowerStatsCollector.java
@@ -78,7 +78,7 @@
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 @@
if (mPowerStatsInternal != null) {
readCpuEnergyConsumerIds();
- } else {
- mCpuEnergyConsumerIds = new int[0];
}
int cpuScalingStepCount = mCpuScalingPolicies.getScalingStepCount();
@@ -320,7 +318,6 @@
private void readCpuEnergyConsumerIds() {
EnergyConsumer[] energyConsumerInfo = mPowerStatsInternal.getEnergyConsumerInfo();
if (energyConsumerInfo == null) {
- mCpuEnergyConsumerIds = new int[0];
return;
}