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

Commit 24051dbe authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Add new DumpUtils printCollection" into main

parents a9d2da6f 724d249a

packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt

+4 −4
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ import com.android.systemui.settings.UserTracker 
import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.util.asIndenting

import com.android.systemui.util.asIndenting

import com.android.systemui.util.concurrency.DelayableExecutor

import com.android.systemui.util.concurrency.DelayableExecutor

import com.android.systemui.util.indentIfPossible

import com.android.systemui.util.withIncreasedIndent

import com.android.wm.shell.taskview.TaskViewFactory

import com.android.wm.shell.taskview.TaskViewFactory

import dagger.Lazy

import dagger.Lazy

import java.io.PrintWriter

import java.io.PrintWriter
@@ -822,9 +822,9 @@ class ControlsUiControllerImpl @Inject constructor ( 
    private fun findSelectionItem(si: SelectedItem, items: List<SelectionItem>): SelectionItem? =

    private fun findSelectionItem(si: SelectedItem, items: List<SelectionItem>): SelectionItem? =

        items.firstOrNull { it.matches(si) }

        items.firstOrNull { it.matches(si) }





    override fun dump(pw: PrintWriter, args: Array<out String>) {

    override fun dump(pw: PrintWriter, args: Array<out String>) = pw.asIndenting().run {

        pw.println("ControlsUiControllerImpl:")

        println("ControlsUiControllerImpl:")

        pw.asIndenting().indentIfPossible {

        withIncreasedIndent {

            println("hidden: $hidden")

            println("hidden: $hidden")

            println("selectedItem: $selectedItem")

            println("selectedItem: $selectedItem")

            println("lastSelections: $lastSelections")

            println("lastSelections: $lastSelections")

packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt

+5 −4
Original line number Original line Diff line number Diff line
@@ -61,7 +61,9 @@ import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.WEATHER 
import com.android.systemui.statusbar.phone.KeyguardBypassController

import com.android.systemui.statusbar.phone.KeyguardBypassController

import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.statusbar.policy.DeviceProvisionedController

import com.android.systemui.statusbar.policy.DeviceProvisionedController

import com.android.systemui.util.asIndenting

import com.android.systemui.util.concurrency.Execution

import com.android.systemui.util.concurrency.Execution

import com.android.systemui.util.printCollection

import com.android.systemui.util.settings.SecureSettings

import com.android.systemui.util.settings.SecureSettings

import com.android.systemui.util.time.SystemClock

import com.android.systemui.util.time.SystemClock

import java.io.PrintWriter

import java.io.PrintWriter
@@ -587,10 +589,9 @@ constructor( 
        return null

        return null

    }

    }





    override fun dump(pw: PrintWriter, args: Array<out String>) {

    override fun dump(pw: PrintWriter, args: Array<out String>) = pw.asIndenting().run {

        pw.println("Region Samplers: ${regionSamplers.size}")

        printCollection("Region Samplers", regionSamplers.values) {

        regionSamplers.map { (_, sampler) ->

            it.dump(this)

            sampler.dump(pw)

        }

        }

    }

    }

}

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/GutsCoordinator.kt

+10 −10
Original line number Original line Diff line number Diff line
@@ -28,6 +28,10 @@ import com.android.systemui.statusbar.notification.collection.render.NotifGutsVi 
import com.android.systemui.statusbar.notification.collection.render.NotifGutsViewManager

import com.android.systemui.statusbar.notification.collection.render.NotifGutsViewManager

import com.android.systemui.statusbar.notification.row.NotificationGuts

import com.android.systemui.statusbar.notification.row.NotificationGuts

import com.android.systemui.statusbar.notification.row.NotificationGutsManager

import com.android.systemui.statusbar.notification.row.NotificationGutsManager

import com.android.systemui.util.asIndenting

import com.android.systemui.util.printCollection

import com.android.systemui.util.println

import com.android.systemui.util.withIncreasedIndent

import java.io.PrintWriter

import java.io.PrintWriter

import javax.inject.Inject

import javax.inject.Inject
@@ -54,7 +58,7 @@ class GutsCoordinator @Inject constructor( 
    private var onEndLifetimeExtensionCallback: OnEndLifetimeExtensionCallback? = null

    private var onEndLifetimeExtensionCallback: OnEndLifetimeExtensionCallback? = null





    init {

    init {

        dumpManager.registerDumpable(TAG, this)

        dumpManager.registerDumpable(this)

    }

    }





    override fun attach(pipeline: NotifPipeline) {

    override fun attach(pipeline: NotifPipeline) {
@@ -62,16 +66,12 @@ class GutsCoordinator @Inject constructor( 
        pipeline.addNotificationLifetimeExtender(mLifetimeExtender)

        pipeline.addNotificationLifetimeExtender(mLifetimeExtender)

    }

    }





    override fun dump(pw: PrintWriter, args: Array<String>) {

    override fun dump(pw: PrintWriter, args: Array<String>) = pw.asIndenting().run {

        pw.println("  notifsWithOpenGuts: ${notifsWithOpenGuts.size}")

        withIncreasedIndent {

        for (key in notifsWithOpenGuts) {

            printCollection("notifsWithOpenGuts", notifsWithOpenGuts)

            pw.println("   * $key")

            printCollection("notifsExtendingLifetime", notifsExtendingLifetime)

            println("onEndLifetimeExtensionCallback", onEndLifetimeExtensionCallback)

        }

        }

        pw.println("  notifsExtendingLifetime: ${notifsExtendingLifetime.size}")

        for (key in notifsExtendingLifetime) {

            pw.println("   * $key")

        }

        pw.println("  onEndLifetimeExtensionCallback: $onEndLifetimeExtensionCallback")

    }

    }





    private val mLifetimeExtender: NotifLifetimeExtender = object : NotifLifetimeExtender {

    private val mLifetimeExtender: NotifLifetimeExtender = object : NotifLifetimeExtender {

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionInconsistencyTracker.kt

+5 −9
Original line number Original line Diff line number Diff line
@@ -20,6 +20,8 @@ import android.service.notification.NotificationListenerService.RankingMap 
import android.util.ArrayMap

import android.util.ArrayMap

import com.android.internal.annotations.VisibleForTesting

import com.android.internal.annotations.VisibleForTesting

import com.android.systemui.statusbar.notification.collection.NotificationEntry

import com.android.systemui.statusbar.notification.collection.NotificationEntry

import com.android.systemui.util.asIndenting

import com.android.systemui.util.printCollection

import java.io.PrintWriter

import java.io.PrintWriter





class NotifCollectionInconsistencyTracker(val logger: NotifCollectionLogger) {

class NotifCollectionInconsistencyTracker(val logger: NotifCollectionLogger) {
@@ -104,15 +106,9 @@ class NotifCollectionInconsistencyTracker(val logger: NotifCollectionLogger) { 
        }

        }

    }

    }





    fun dump(pw: PrintWriter) {

    fun dump(pw: PrintWriter) = pw.asIndenting().run {

        pw.println("notificationsWithoutRankings: ${notificationsWithoutRankings.size}")

        printCollection("notificationsWithoutRankings", notificationsWithoutRankings)

        for (key in notificationsWithoutRankings) {

        printCollection("missingNotifications", missingNotifications)

            pw.println("\t * : $key")

        }

        pw.println("missingNotifications: ${missingNotifications.size}")

        for (key in missingNotifications) {

            pw.println("\t * : $key")

        }

    }

    }





    private var attached: Boolean = false

    private var attached: Boolean = false

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/SelfTrackingLifetimeExtender.kt

+9 −4
Original line number Original line Diff line number Diff line
@@ -5,6 +5,10 @@ import android.util.ArrayMap 
import android.util.Log

import android.util.Log

import com.android.systemui.Dumpable

import com.android.systemui.Dumpable

import com.android.systemui.statusbar.notification.collection.NotificationEntry

import com.android.systemui.statusbar.notification.collection.NotificationEntry

import com.android.systemui.util.asIndenting

import com.android.systemui.util.printCollection

import com.android.systemui.util.println

import com.android.systemui.util.withIncreasedIndent

import java.io.PrintWriter

import java.io.PrintWriter





/**

/**
@@ -104,9 +108,10 @@ abstract class SelfTrackingLifetimeExtender( 
        mCallback = callback

        mCallback = callback

    }

    }





    final override fun dump(pw: PrintWriter, args: Array<out String>) {

    final override fun dump(pw: PrintWriter, args: Array<out String>) = pw.asIndenting().run {

        pw.println("LifetimeExtender: $name:")

        println("LifetimeExtender", name)

        pw.println("  mEntriesExtended: ${mEntriesExtended.size}")

        withIncreasedIndent {

        mEntriesExtended.forEach { pw.println("  * ${it.key}") }

            printCollection("mEntriesExtended", mEntriesExtended.keys)

        }

    }

    }

}
 
}
 
 No newline at end of file