From 1533ffdc3e8dc775399a8c02039e0ad3e7f3ca1f Mon Sep 17 00:00:00 2001
From: Yi Jin <jinyithu@google.com>
Date: Wed, 2 Aug 2017 17:39:15 -0700
Subject: [PATCH] There must not have newline character in wakelock name

Bug: 64272195
Test: N/A
Change-Id: I07a7d9b9dfbf69acba0123bf4ec6e309c2a5a359
(cherry picked from commit dd214c2d3692c850d271bc4ab2dc45dcc5ebc6a6)
---
 core/java/android/os/BatteryStats.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index 54d5860048ade..cc6b5e1e3ce3a 100644
--- 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());
                 }
             }