Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f80cd763 authored by Aaron Liu's avatar Aaron Liu
Browse files

Fix crash loop with back handler 

STL throws an exception if there is no back handler.

Fixes: 334082824
Test: flexiglass reset
Test: boot up system ui and ensure that no crash looping.
Flag: ACONFIG com.android.systemui.compose_lockscreen DEVELOPMENT

Change-Id: I9e3b8ab9a9332c285e2ef2ad2edf8588bb5b56af
parent db03730b

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

                            ->