Merge "KeyguardPreviewRenderer: Drop usages of runBlocking" into main (5675016b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt

+24 −13

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ import androidx.constraintlayout.widget.ConstraintSet.TOP
		import androidx.core.view.isInvisible
		import com.android.app.tracing.coroutines.runBlockingTraced as runBlocking
		import com.android.keyguard.ClockEventController
		import com.android.systemui.Flags
		import com.android.systemui.animation.view.LaunchableImageView
		import com.android.systemui.biometrics.domain.interactor.UdfpsOverlayInteractor
		import com.android.systemui.broadcast.BroadcastDispatcher
		@@ -122,7 +123,7 @@ constructor(
		private val keyguardQuickAffordanceViewBinder: KeyguardQuickAffordanceViewBinder,
		private val wallpaperFocalAreaInteractor: WallpaperFocalAreaInteractor,
		) {
		private var host: SurfaceControlViewHost
		private lateinit var host: SurfaceControlViewHost

		private var _surfacePackage: SurfaceControlViewHost.SurfacePackage? = null
		val surfacePackage: SurfaceControlViewHost.SurfacePackage
		@@ -148,7 +149,18 @@ constructor(
		shouldHighlightSelectedAffordance = previewViewModel.shouldHighlightSelectedAffordance,
		)

		if (Flags.doNotUseRunBlocking()) {
		mainHandler.post {
		provideSurfaceControlViewHost(displayManager)
		}
		} else {
		runBlocking(context = mainDispatcher) {
		provideSurfaceControlViewHost(displayManager)
		}
		}
		}

		private fun provideSurfaceControlViewHost(displayManager: DisplayManager) {
		host =
		SurfaceControlViewHost(
		context,
		@@ -162,7 +174,6 @@ constructor(
		host.release()
		}
		}
		}

		fun render() {
		mainHandler.post {