Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-07 21:10:49 +00:00
committed by Android (Google) Code Review
parent ce3e863f31 0248336d4c
commit 8ce50255c5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/os/BatteryStats.java
View File

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