Merge "Fix crash loop with back handler" into main (b9070b2f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt

+19 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,9 @@ import android.view.ViewGroup
		import android.view.ViewGroup.OnHierarchyChangeListener
		import android.view.ViewPropertyAnimator
		import android.view.WindowInsets
		import androidx.activity.OnBackPressedDispatcher
		import androidx.activity.OnBackPressedDispatcherOwner
		import androidx.activity.setViewTreeOnBackPressedDispatcherOwner
		import androidx.lifecycle.Lifecycle
		import androidx.lifecycle.repeatOnLifecycle
		import com.android.app.animation.Interpolators
		@@ -49,6 +52,7 @@ import com.android.systemui.keyguard.KeyguardBottomAreaRefactor
		import com.android.systemui.keyguard.KeyguardViewMediator
		import com.android.systemui.keyguard.MigrateClocksToBlueprint
		import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor
		import com.android.systemui.keyguard.shared.ComposeLockscreen
		import com.android.systemui.keyguard.shared.model.KeyguardState
		import com.android.systemui.keyguard.shared.model.TransitionState
		import com.android.systemui.keyguard.ui.viewmodel.BurnInParameters
		@@ -125,6 +129,21 @@ object KeyguardRootViewBinder {
		disposables +=
		view.repeatWhenAttached {
		repeatOnLifecycle(Lifecycle.State.CREATED) {
		if (ComposeLockscreen.isEnabled) {
		view.setViewTreeOnBackPressedDispatcherOwner(
		object : OnBackPressedDispatcherOwner {
		override val onBackPressedDispatcher =
		OnBackPressedDispatcher().apply {
		setOnBackInvokedDispatcher(
		view.viewRootImpl.onBackInvokedDispatcher
		)
		}

		override val lifecycle: Lifecycle =
		this@repeatWhenAttached.lifecycle
		}
		)
		}
		launch {
		occludingAppDeviceEntryMessageViewModel.message.collect { biometricMessage
		->