Merge "Fix registerDumpable deprecation warnings" into main (68734225) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/dump/DumpHandlerTest.kt

+4 −0

Original line number	Diff line number	Diff line
		@@ -275,7 +275,9 @@ class DumpHandlerTest : SysuiTestCase() {

		@Test
		fun testDumpAllProtoDumpables() {
		@Suppress("DEPRECATION")
		dumpManager.registerDumpable("protoDumpable1", protoDumpable1)
		@Suppress("DEPRECATION")
		dumpManager.registerDumpable("protoDumpable2", protoDumpable2)

		val args = arrayOf(DumpHandler.PROTO)
		@@ -287,7 +289,9 @@ class DumpHandlerTest : SysuiTestCase() {

		@Test
		fun testDumpSingleProtoDumpable() {
		@Suppress("DEPRECATION")
		dumpManager.registerDumpable("protoDumpable1", protoDumpable1)
		@Suppress("DEPRECATION")
		dumpManager.registerDumpable("protoDumpable2", protoDumpable2)

		val args = arrayOf(DumpHandler.PROTO, "protoDumpable1")

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ class BootCompleteCacheImpl @Inject constructor(dumpManager: DumpManager) :
		}

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

		@GuardedBy("listeners")

+1 −1

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>(

		override fun onViewAttached() {
		dialogManager.registerListener(dialogListener)
		dumpManager.registerDumpable(dumpTag, this)
		dumpManager.registerNormalDumpable(dumpTag, this)
		udfpsOverlayInteractor.setHandleTouches(shouldHandle = !shouldPauseAuth())
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ constructor(

		init {
		Log.d(TAG, "Initializing")
		dumpManager.registerDumpable(TAG, this)
		dumpManager.registerNormalDumpable(TAG, this)
		serviceListing.addCallback(serviceListingCallback)
		serviceListing.setListening(true)
		serviceListing.reload()

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ constructor(

		init {
		legacySettingSyncer.startSyncing()
		dumpManager.registerDumpable("KeyguardQuickAffordances", Dumpster())
		dumpManager.registerNormalDumpable("KeyguardQuickAffordances", Dumpster())
		}

		/**