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

Merge "Don't format the LogMessage twice for systrace and logcat."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-02 21:17:48 +00:00
committed by Android (Google) Code Review
parent 6b06740dab 76c2d028c9
commit 606354beeb
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/SystemUI/src/com/android/systemui/log/LogBuffer.kt
View File

@@ -176,14 +176,9 @@ class LogBuffer @JvmOverloads constructor(
buffer.removeFirst()
}
buffer.add(message as LogMessageImpl)
if (systrace) {
val messageStr = message.printer(message)
Trace.instantForTrack(Trace.TRACE_TAG_APP, "UI Events", "$name - $messageStr")
}
if (logcatEchoTracker.isBufferLoggable(name, message.level) ||
logcatEchoTracker.isTagLoggable(message.tag, message.level)) {
echo(message)
}
val includeInLogcat = logcatEchoTracker.isBufferLoggable(name, message.level) ||
logcatEchoTracker.isTagLoggable(message.tag, message.level)
echo(message, toLogcat = includeInLogcat, toSystrace = systrace)
}
/** Converts the entire buffer to a newline-delimited string */
@@ -232,8 +227,24 @@ class LogBuffer @JvmOverloads constructor(
pw.println(message.printer(message))
}
private fun echo(message: LogMessage) {
val strMessage = message.printer(message)
private fun echo(message: LogMessage, toLogcat: Boolean, toSystrace: Boolean) {
if (toLogcat || toSystrace) {
val strMessage = message.printer(message)
if (toSystrace) {
echoToSystrace(message, strMessage)
}
if (toLogcat) {
echoToLogcat(message, strMessage)
}
}
}
private fun echoToSystrace(message: LogMessage, strMessage: String) {
Trace.instantForTrack(Trace.TRACE_TAG_APP, "UI Events",
"$name - ${message.level.shortString} ${message.tag}: $strMessage")
}
private fun echoToLogcat(message: LogMessage, strMessage: String) {
when (message.level) {
LogLevel.VERBOSE -> Log.v(message.tag, strMessage)
LogLevel.DEBUG -> Log.d(message.tag, strMessage)