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

Commit 10841a96 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "There must not have newline character in wakelock name" into oc-mr1-dev

parents 48dad606 1533ffdc

core/java/android/os/BatteryStats.java

+1 −0
Original line number Diff line number Diff line
@@ -3544,6 +3544,7 @@ public abstract class BatteryStats implements Parcelable { 
                    if (name.indexOf(',') >= 0) {

                        name = name.replace(',', '_');

                    }

                    name = name.replaceAll("[\\n|\\r]+", "");

                    dumpLine(pw, uid, category, WAKELOCK_DATA, name, sb.toString());

                }

            }