summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dmitri Plotnikov <dplotnikov@google.com> 2023-11-08 15:04:04 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> 2023-11-08 15:05:54 -0800
commitfdd04adc8ff3cd9c40b4e4c198a949de0c38b8df (patch)
treed5a79a681971672ba15ac12e98a602100a440e6a
parente619e972988d960bad876ded08ec1d222fb740da (diff)
Fix NPE in `dumpsys batterystats` when `streamlined_battery_stats` is disabled
Bug: 308999321 Test: adb shell device_config put backstage_power com.android.server.power.optimization.streamlined_battery_stats false adb shell dumpsys batterystats Change-Id: Icd965c5ebadafd31e88a44099fb5c23ae214c141
-rw-r--r--services/core/java/com/android/server/power/stats/CpuPowerStatsCollector.java4
1 files changed, 4 insertions, 0 deletions
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 a388932cb708..b8e581f32a58 100644
--- a/services/core/java/com/android/server/power/stats/CpuPowerStatsCollector.java
+++ b/services/core/java/com/android/server/power/stats/CpuPowerStatsCollector.java
@@ -592,6 +592,10 @@ public class CpuPowerStatsCollector extends PowerStatsCollector {
public void dumpCpuPowerBracketsLocked(PrintWriter pw) {
ensureInitialized();
+ if (mLayout == null) {
+ return;
+ }
+
pw.println("CPU power brackets; cluster/freq in MHz(avg current in mA):");
for (int bracket = 0; bracket < mLayout.getCpuPowerBracketCount(); bracket++) {
pw.print(" ");