summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dmitri Plotnikov <dplotnikov@google.com> 2024-07-30 17:02:46 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> 2024-07-31 01:33:36 +0000
commit09c5b2d416bae48f7727702e25b87f9ef913bb5b (patch)
tree06f0444e0f8c2fd5cbad8d494ebe4f8905446981
parent222008e5e99dd983a2e4ef254f05b4b29d9aa67c (diff)
Fix NPE when PowerStats throttle period config is missing
Bug: 356427210 Test: atest PowerStatsTest Flag: EXEMPT bugfix Change-Id: Ie6c90eb540054e1ad77b505b3f693fa33dbff923
-rw-r--r--services/core/java/com/android/server/am/BatteryStatsService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index 03fbfd37cbdb..f936b8174c28 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -620,6 +620,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub
private void setPowerStatsThrottlePeriods(BatteryStatsImpl.BatteryStatsConfig.Builder builder,
String configString) {
+ if (configString == null) {
+ return;
+ }
+
Matcher matcher = Pattern.compile("([^:]+):(\\d+)\\s*").matcher(configString);
while (matcher.find()) {
String powerComponentName = matcher.group(1);