From 264bb458ddf130a9f5c7a3344a87ff913f1a4128 Mon Sep 17 00:00:00 2001 From: Beverly Date: Tue, 29 Oct 2019 12:43:17 -0400 Subject: [PATCH] By default, rich events have log level VERBOSE So that on debuggable devices, we'll see SysuiLogs in logcat for events logged that don't specify their log level For logcat logs, don't include the timestamp Test: manual Change-Id: If2cb238e70acc5a551d4b4a4161dc0020536cec9 --- .../src/com/android/systemui/log/RichEvent.java | 2 +- .../src/com/android/systemui/log/SysuiLog.java | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/log/RichEvent.java b/packages/SystemUI/src/com/android/systemui/log/RichEvent.java index 89b7a8181c446..acf761ed3936c 100644 --- a/packages/SystemUI/src/com/android/systemui/log/RichEvent.java +++ b/packages/SystemUI/src/com/android/systemui/log/RichEvent.java @@ -67,7 +67,7 @@ public abstract class RichEvent extends Event { private B mBuilder = getBuilder(); protected int mType = UNINITIALIZED; protected String mReason; - protected @Level int mLogLevel; + protected @Level int mLogLevel = VERBOSE; /** * Get the log-specific builder. diff --git a/packages/SystemUI/src/com/android/systemui/log/SysuiLog.java b/packages/SystemUI/src/com/android/systemui/log/SysuiLog.java index a6e10e6b345b9..f094cb909cf25 100644 --- a/packages/SystemUI/src/com/android/systemui/log/SysuiLog.java +++ b/packages/SystemUI/src/com/android/systemui/log/SysuiLog.java @@ -120,9 +120,9 @@ public class SysuiLog implements Dumpable { } /** - * @return user-readable string of the given event + * @return user-readable string of the given event with timestamp */ - public String eventToString(Event event) { + public String eventToTimestampedString(Event event) { StringBuilder sb = new StringBuilder(); sb.append(SysuiLog.DATE_FORMAT.format(event.getTimestamp())); sb.append(" "); @@ -130,6 +130,13 @@ public class SysuiLog implements Dumpable { return sb.toString(); } + /** + * @return user-readable string of the given event without a timestamp + */ + public String eventToString(Event event) { + return event.getMessage(); + } + /** * only call on this method if you have the mDataLock */ @@ -137,7 +144,7 @@ public class SysuiLog implements Dumpable { pw.println("\tTimeline:"); for (Event event : mTimeline) { - pw.println("\t" + eventToString(event)); + pw.println("\t" + eventToTimestampedString(event)); } }