Merge "Fix crash loop when compose_bouncer is on. Flag guard is already... (a01d0ca4) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bouncer/ui/binder/ComposeBouncerViewBinder.kt

+21 −1

Original line number	Diff line number	Diff line
		package com.android.systemui.bouncer.ui.binder

		import android.view.ViewGroup
		import androidx.activity.OnBackPressedDispatcher
		import androidx.activity.OnBackPressedDispatcherOwner
		import androidx.activity.setViewTreeOnBackPressedDispatcherOwner
		import androidx.compose.ui.platform.ComposeView
		import androidx.core.view.isVisible
		import androidx.lifecycle.Lifecycle
		@@ -30,8 +33,25 @@ object ComposeBouncerViewBinder {
		) {
		view.addView(
		ComposeView(view.context).apply {
		repeatWhenAttached {
		repeatOnLifecycle(Lifecycle.State.CREATED) {
		setViewTreeOnBackPressedDispatcherOwner(
		object : OnBackPressedDispatcherOwner {
		override val onBackPressedDispatcher =
		OnBackPressedDispatcher().apply {
		setOnBackInvokedDispatcher(
		view.viewRootImpl.onBackInvokedDispatcher
		)
		}

		override val lifecycle: Lifecycle =
		this@repeatWhenAttached.lifecycle
		}
		)
		setContent { PlatformTheme { BouncerContent(viewModel, dialogFactory) } }
		}
		}
		}
		)

		view.repeatWhenAttached {