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

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

Fix NPE in batterystats history log 

Bug: 384987946
Flag: EXEMPT bugfix
Test: atest PowerStatsTests
Change-Id: I382701b5b637f7e4eaf787ef1ddbb2ac92adf6da
parent 0fd6b40d

core/java/android/os/BatteryStats.java

+3 −1
Original line number Diff line number Diff line
@@ -6895,7 +6895,9 @@ public abstract class BatteryStats { 
                                || wakelockTag.poolIdx == HistoryTag.HISTORY_TAG_POOL_OVERFLOW) {

                            UserHandle.formatUid(sb, wakelockTag.uid);

                            sb.append(":\"");

                            if (wakelockTag.string != null) {

                                sb.append(wakelockTag.string.replace("\"", "\"\""));

                            }

                            sb.append("\"");

                        } else {

                            sb.append(wakelockTag.poolIdx);