diff options
7 files changed, 24 insertions, 13 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/dump/DumpHandler.kt b/packages/SystemUI/src/com/android/systemui/dump/DumpHandler.kt index ae40f7e8d7c0..7150d69e130d 100644 --- a/packages/SystemUI/src/com/android/systemui/dump/DumpHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/dump/DumpHandler.kt @@ -432,9 +432,11 @@ constructor( } private inline fun PrintWriter.wrapSection(entry: DumpsysEntry, block: () -> Unit) { + Trace.beginSection(entry.name) preamble(entry) val dumpTime = measureTimeMillis(block) footer(entry, dumpTime) + Trace.endSection() } /** diff --git a/packages/SystemUI/src/com/android/systemui/dump/DumpsysTableLogger.kt b/packages/SystemUI/src/com/android/systemui/dump/DumpsysTableLogger.kt index f7e6b98a0f06..2e9d04bf0bea 100644 --- a/packages/SystemUI/src/com/android/systemui/dump/DumpsysTableLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/dump/DumpsysTableLogger.kt @@ -16,6 +16,7 @@ package com.android.systemui.dump +import android.os.Trace import java.io.PrintWriter /** @@ -83,31 +84,33 @@ class DumpsysTableLogger( ) { fun printTableData(pw: PrintWriter) { + Trace.beginSection("DumpsysTableLogger#printTableData") printSectionStart(pw) printSchema(pw) printData(pw) printSectionEnd(pw) + Trace.endSection() } private fun printSectionStart(pw: PrintWriter) { - pw.println(HEADER_PREFIX + sectionName) - pw.println("version $VERSION") + pw.append(HEADER_PREFIX).println(sectionName) + pw.append("version ").println(VERSION) } private fun printSectionEnd(pw: PrintWriter) { - pw.println(FOOTER_PREFIX + sectionName) + pw.append(FOOTER_PREFIX).println(sectionName) } private fun printSchema(pw: PrintWriter) { - pw.println(columns.joinToString(separator = SEPARATOR)) + columns.joinTo(pw, separator = SEPARATOR).println() } private fun printData(pw: PrintWriter) { val count = columns.size - rows - .filter { it.size == count } - .forEach { dataLine -> - pw.println(dataLine.joinToString(separator = SEPARATOR)) + rows.forEach { dataLine -> + if (dataLine.size == count) { + dataLine.joinTo(pw, separator = SEPARATOR).println() + } } } } diff --git a/packages/SystemUI/src/com/android/systemui/log/table/TableLogBuffer.kt b/packages/SystemUI/src/com/android/systemui/log/table/TableLogBuffer.kt index 67a985eb44bc..a7ffc5fa8054 100644 --- a/packages/SystemUI/src/com/android/systemui/log/table/TableLogBuffer.kt +++ b/packages/SystemUI/src/com/android/systemui/log/table/TableLogBuffer.kt @@ -302,14 +302,14 @@ class TableLogBuffer( @Synchronized override fun dump(pw: PrintWriter, args: Array<out String>) { - pw.println(HEADER_PREFIX + name) - pw.println("version $VERSION") + pw.append(HEADER_PREFIX).println(name) + pw.append("version ").println(VERSION) lastEvictedValues.values.sortedBy { it.timestamp }.forEach { it.dump(pw) } for (i in 0 until buffer.size) { buffer[i].dump(pw) } - pw.println(FOOTER_PREFIX + name) + pw.append(FOOTER_PREFIX).println(name) } /** Dumps an individual [TableChange]. */ diff --git a/packages/SystemUI/src/com/android/systemui/shade/NPVCDownEventState.kt b/packages/SystemUI/src/com/android/systemui/shade/NPVCDownEventState.kt index 6143308a7cbf..4644d415ea72 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NPVCDownEventState.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/NPVCDownEventState.kt @@ -108,7 +108,7 @@ class NPVCDownEventState private constructor( * @see NPVCDownEventState.asStringList */ fun toList(): List<Row> { - return buffer.asSequence().map { it.asStringList }.toList() + return buffer.map { it.asStringList } } } diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 35fd98cf34c6..f9ca05ae02fb 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -3447,11 +3447,13 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump ipw.print("mIgnoreXTouchSlop="); ipw.println(mIgnoreXTouchSlop); ipw.print("mExpandLatencyTracking="); ipw.println(mExpandLatencyTracking); ipw.println("gestureExclusionRect:" + calculateGestureExclusionRect()); + Trace.beginSection("Table<DownEvents>"); new DumpsysTableLogger( TAG, NPVCDownEventState.TABLE_HEADERS, mLastDownEvents.toList() ).printTableData(ipw); + Trace.endSection(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java index 1f401fbbe6c1..d2b62eb3779d 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java @@ -840,13 +840,17 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW pw.println(" mDeferWindowLayoutParams=" + mDeferWindowLayoutParams); pw.println(mCurrentState); if (mWindowRootView != null && mWindowRootView.getViewRootImpl() != null) { + Trace.beginSection("mWindowRootView.dump()"); mWindowRootView.getViewRootImpl().dump(" ", pw); + Trace.endSection(); } + Trace.beginSection("Table<State>"); new DumpsysTableLogger( TAG, NotificationShadeWindowState.TABLE_HEADERS, mStateBuffer.toList() ).printTableData(pw); + Trace.endSection(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowState.kt b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowState.kt index d25294343d2f..e3010ca72194 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowState.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowState.kt @@ -170,7 +170,7 @@ class NotificationShadeWindowState( * @see [NotificationShadeWindowState.asStringList] */ fun toList(): List<Row> { - return buffer.asSequence().map { it.asStringList }.toList() + return buffer.map { it.asStringList } } } |