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

Commit a92f00b7 authored by Yi Jin's avatar Yi Jin Committed by android-build-merger
Browse files

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

am: 10841a96

Change-Id: I832c6e037d74d44de610facc58ed4e0deda6c667
parents a0e00f50 10841a96

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

                }

            }