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

Commit c6ee71fc authored by Leon Masopust's avatar Leon Masopust Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Fix SecureCamera disappearing on Gone" into main

parents 5f309592 27be2bb7

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt

+28 −1
Original line number Original line Diff line number Diff line
@@ -167,7 +167,7 @@ class KeyguardInteractorTest : SysuiTestCase() { 
        }

        }





    @Test

    @Test

    @DisableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testGoneStateResetsCameraActive() =

    fun testGoneStateResetsCameraActive() =

        testScope.runTest {

        testScope.runTest {

            val secureCameraActive = collectLastValue(underTest.isSecureCameraActive)

            val secureCameraActive = collectLastValue(underTest.isSecureCameraActive)
@@ -183,6 +183,33 @@ class KeyguardInteractorTest : SysuiTestCase() { 
            assertThat(secureCameraActive()).isFalse()

            assertThat(secureCameraActive()).isFalse()

        }

        }





    @Test

    @EnableSceneContainer

    fun testScenesGoneStateResetsCameraActive() =

        testScope.runTest {

            val secureCameraActive = collectLastValue(underTest.isSecureCameraActive)

            runCurrent()



            underTest.onCameraLaunchDetected(

                StatusBarManager.CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP,

                isSecureCamera = true,

            )

            assertThat(secureCameraActive()).isTrue()



            transitionState.value =

                ObservableTransitionState.Transition(

                    fromScene = Scenes.Lockscreen,

                    toScene = Scenes.Gone,

                    currentScene = flowOf(Scenes.Gone),

                    progress = flowOf(1f),

                    isInitiatedByUserInput = false,

                    isUserInputOngoing = flowOf(false),

                )

            runCurrent()



            assertThat(secureCameraActive()).isFalse()

        }



    /** Regression test for b/373700726. */

    /** Regression test for b/373700726. */

    @Test

    @Test

    @DisableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR)

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -305,7 +305,7 @@ constructor( 
                    .filter { it }

                    .filter { it }

                    .map { SecureCameraRelatedEventType.PrimaryBouncerBecameVisible },

                    .map { SecureCameraRelatedEventType.PrimaryBouncerBecameVisible },

                keyguardTransitionInteractor

                keyguardTransitionInteractor

                    .transitionValue(GONE)

                    .transitionValue(content = Scenes.Gone, stateWithoutSceneContainer = GONE)

                    .filter { it == 1f }

                    .filter { it == 1f }

                    .map { SecureCameraRelatedEventType.InGoneState },

                    .map { SecureCameraRelatedEventType.InGoneState },

            )

            )