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

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

Merge "Only replace new line characters if the wakelock name contains one The... 

Merge "Only replace new line characters if the wakelock name contains one The original operation creates new string everytime which is expensive" into oc-mr1-dev
parents ce3e863f 0248336d

core/java/android/os/BatteryStats.java

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

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

                    }

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

                    if (name.indexOf('\n') >= 0) {

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

                    }

                    if (name.indexOf('\r') >= 0) {

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

                    }

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

                }

            }