Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1186f02f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I3f89a3e1,I4a5397d3 into udc-qpr-dev am: b1618ade am: 5770f60f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24360415



Change-Id: Ia9a9dbcd3d0e0c52a4670b837a8bd737250b4c32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab47da9d 5770f60f

packages/SystemUI/src/com/android/systemui/dump/DumpHandler.kt

+2 −0
Original line number Diff line number Diff line
@@ -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()

        }



        /**

packages/SystemUI/src/com/android/systemui/dump/DumpsysTableLogger.kt

+11 −8
Original line number Diff line number Diff line
@@ -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()

            }

        }

    }

}

packages/SystemUI/src/com/android/systemui/log/table/TableLogBuffer.kt

+3 −3
Original line number Diff line number Diff line
@@ -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]. */

packages/SystemUI/src/com/android/systemui/shade/NPVCDownEventState.kt

+1 −1
Original line number Diff line number Diff line
@@ -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 }

        }

    }

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+2 −0
Original line number Diff line number Diff line
@@ -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