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

Commit ad73834f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in batterystats history log" into main

parents 1b8f3b07 cf34d077

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);