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

Commit 566c9a0c authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

[flexiglass] Don't switch to gone if already switching to LS. 

Fix: 330476229
Test: unit test added
Test: manually verified by turning off the display and turning on the
display, with pattern as the auth method, with "lock instantly" turned
on or off and with AOD turned on or off; compared the behaviour to
pre-Flexilgass and vierifed it's the same.
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT

Change-Id: I1c580b07ddb6d42c3cd901910cea3df6c4f36c29
parent 7212fb02

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/startable/SceneContainerStartableTest.kt

+29 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ class SceneContainerStartableTest : SysuiTestCase() { 
        }



    @Test

    fun doesNotSwitchToGoneWhenDeviceStartsToWakeUp_authMethodSecure() =

    fun doesNotSwitchToGone_whenDeviceStartsToWakeUp_authMethodSecure() =

        testScope.runTest {

            val currentSceneKey by collectLastValue(sceneInteractor.currentScene)

            prepareState(
@@ -486,6 +486,34 @@ class SceneContainerStartableTest : SysuiTestCase() { 
            assertThat(currentSceneKey).isEqualTo(Scenes.Lockscreen)

        }



    @Test

    fun doesNotSwitchToGone_whenDeviceStartsToWakeUp_ifAlreadyTransitioningToLockscreen() =

        testScope.runTest {

            val currentSceneKey by collectLastValue(sceneInteractor.currentScene)

            val transitioningTo by collectLastValue(sceneInteractor.transitioningTo)

            val transitionStateFlow =

                prepareState(

                    isDeviceUnlocked = true,

                    initialSceneKey = Scenes.Gone,

                    authenticationMethod = AuthenticationMethodModel.Pin,

                )

            transitionStateFlow.value =

                ObservableTransitionState.Transition(

                    fromScene = Scenes.Gone,

                    toScene = Scenes.Lockscreen,

                    progress = flowOf(0.1f),

                    isInitiatedByUserInput = false,

                    isUserInputOngoing = flowOf(false),

                )

            assertThat(currentSceneKey).isEqualTo(Scenes.Gone)

            assertThat(transitioningTo).isEqualTo(Scenes.Lockscreen)

            underTest.start()

            powerInteractor.setAwakeForTest()



            assertThat(currentSceneKey).isEqualTo(Scenes.Gone)

            assertThat(transitioningTo).isEqualTo(Scenes.Lockscreen)

        }



    @Test

    fun switchToGoneWhenDeviceStartsToWakeUp_authMethodSecure_deviceUnlocked() =

        testScope.runTest {

packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt

+11 −6
Original line number Diff line number Diff line
@@ -294,12 +294,17 @@ constructor( 
                    val canSwipeToEnter = deviceEntryInteractor.canSwipeToEnter.value

                    val isUnlocked = deviceEntryInteractor.isUnlocked.value

                    if (isUnlocked && canSwipeToEnter == false) {

                        val isTransitioningToLockscreen =

                            sceneInteractor.transitioningTo.value == Scenes.Lockscreen

                        if (!isTransitioningToLockscreen) {

                            switchToScene(

                                targetSceneKey = Scenes.Gone,

                                loggingReason =

                                "device is waking up while unlocked without the ability" +

                                    " to swipe up on lockscreen to enter.",

                                    "device is waking up while unlocked without the ability to" +

                                        " swipe up on lockscreen to enter and not on or" +

                                        " transitioning to, the lockscreen scene.",

                            )

                        }

                    } else if (

                        authenticationInteractor.get().getAuthenticationMethod() ==

                            AuthenticationMethodModel.Sim