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

am: 10841a9670 Change-Id: I832c6e037d74d44de610facc58ed4e0deda6c667
2017-08-04 02:27:58 +00:00
parent a0e00f5015 10841a9670
commit a92f00b750
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -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());
                }
            }