Merge "There must not have newline character in wakelock name" (be738c5a) · Commits · e / os / android_frameworks_base

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