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

Commit 09c5b2d4 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Fix NPE when PowerStats throttle period config is missing 

Bug: 356427210
Test: atest PowerStatsTest
Flag: EXEMPT bugfix
Change-Id: Ie6c90eb540054e1ad77b505b3f693fa33dbff923
parent 222008e5

services/core/java/com/android/server/am/BatteryStatsService.java

+4 −0
Original line number Diff line number Diff line
@@ -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);