Merge "Add new DumpUtils printCollection" into main (24051dbe) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	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.util.asIndenting
		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 dagger.Lazy
		import java.io.PrintWriter
		@@ -822,9 +822,9 @@ class ControlsUiControllerImpl @Inject constructor (
		private fun findSelectionItem(si: SelectedItem, items: List<SelectionItem>): SelectionItem? =
		items.firstOrNull { it.matches(si) }

		override fun dump(pw: PrintWriter, args: Array<out String>) {
		pw.println("ControlsUiControllerImpl:")
		pw.asIndenting().indentIfPossible {
		override fun dump(pw: PrintWriter, args: Array<out String>) = pw.asIndenting().run {
		println("ControlsUiControllerImpl:")
		withIncreasedIndent {
		println("hidden: $hidden")
		println("selectedItem: $selectedItem")
		println("lastSelections: $lastSelections")

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

+5 −4

Original line number	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.policy.ConfigurationController
		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.printCollection
		import com.android.systemui.util.settings.SecureSettings
		import com.android.systemui.util.time.SystemClock
		import java.io.PrintWriter
		@@ -587,10 +589,9 @@ constructor(
		return null
		}

		override fun dump(pw: PrintWriter, args: Array<out String>) {
		pw.println("Region Samplers: ${regionSamplers.size}")
		regionSamplers.map { (_, sampler) ->
		sampler.dump(pw)
		override fun dump(pw: PrintWriter, args: Array<out String>) = pw.asIndenting().run {
		printCollection("Region Samplers", regionSamplers.values) {
		it.dump(this)
		}
		}
		}

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

+10 −10

Original line number	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.row.NotificationGuts
		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 javax.inject.Inject

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

		init {
		dumpManager.registerDumpable(TAG, this)
		dumpManager.registerDumpable(this)
		}

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

		override fun dump(pw: PrintWriter, args: Array<String>) {
		pw.println(" notifsWithOpenGuts: ${notifsWithOpenGuts.size}")
		for (key in notifsWithOpenGuts) {
		pw.println(" * $key")
		override fun dump(pw: PrintWriter, args: Array<String>) = pw.asIndenting().run {
		withIncreasedIndent {
		printCollection("notifsWithOpenGuts", notifsWithOpenGuts)
		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 {

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

+5 −9

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import android.service.notification.NotificationListenerService.RankingMap
		import android.util.ArrayMap
		import com.android.internal.annotations.VisibleForTesting
		import com.android.systemui.statusbar.notification.collection.NotificationEntry
		import com.android.systemui.util.asIndenting
		import com.android.systemui.util.printCollection
		import java.io.PrintWriter

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

		fun dump(pw: PrintWriter) {
		pw.println("notificationsWithoutRankings: ${notificationsWithoutRankings.size}")
		for (key in notificationsWithoutRankings) {
		pw.println("\t * : $key")
		}
		pw.println("missingNotifications: ${missingNotifications.size}")
		for (key in missingNotifications) {
		pw.println("\t * : $key")
		}
		fun dump(pw: PrintWriter) = pw.asIndenting().run {
		printCollection("notificationsWithoutRankings", notificationsWithoutRankings)
		printCollection("missingNotifications", missingNotifications)
		}

		private var attached: Boolean = false

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -5,6 +5,10 @@ import android.util.ArrayMap
		import android.util.Log
		import com.android.systemui.Dumpable
		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

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

		final override fun dump(pw: PrintWriter, args: Array<out String>) {
		pw.println("LifetimeExtender: $name:")
		pw.println(" mEntriesExtended: ${mEntriesExtended.size}")
		mEntriesExtended.forEach { pw.println(" * ${it.key}") }
		final override fun dump(pw: PrintWriter, args: Array<out String>) = pw.asIndenting().run {
		println("LifetimeExtender", name)
		withIncreasedIndent {
		printCollection("mEntriesExtended", mEntriesExtended.keys)
		}
		}
		}
		No newline at end of file