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

Commit 2f2da34d authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Reset the face authenticated state when transitioning to GONE" into main

parents 96b8b4f7 48f82c23

packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepositoryTest.kt

+8 −2
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { 
        }



    @Test

    fun isAuthenticatedIsResetToFalseWhenKeyguardDoneAnimationsFinished() =

    fun isAuthenticatedIsResetToFalseWhenTransitioningToGone() =

        testScope.runTest {

            initCollectors()

            allPreconditionsToRunFaceAuthAreTrue()
@@ -840,7 +840,13 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { 


            assertThat(authenticated()).isTrue()



            keyguardRepository.keyguardDoneAnimationsFinished()

            keyguardTransitionRepository.sendTransitionStep(

                TransitionStep(

                    transitionState = TransitionState.STARTED,

                    from = KeyguardState.LOCKSCREEN,

                    to = KeyguardState.GONE,

                )

            )



            assertThat(authenticated()).isFalse()

        }

packages/SystemUI/src/com/android/systemui/deviceentry/data/repository/DeviceEntryFaceAuthRepository.kt

+1 −6
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import com.android.systemui.deviceentry.shared.model.FailedFaceAuthenticationSta 
import com.android.systemui.deviceentry.shared.model.HelpFaceAuthenticationStatus

import com.android.systemui.deviceentry.shared.model.SuccessFaceAuthenticationStatus

import com.android.systemui.dump.DumpManager

import com.android.systemui.keyguard.KeyguardWmStateRefactor

import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository

import com.android.systemui.keyguard.data.repository.BiometricType

import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository
@@ -313,11 +312,7 @@ constructor( 
        // or device starts going to sleep.

        merge(

                powerInteractor.isAsleep,

                if (KeyguardWmStateRefactor.isEnabled) {

                    keyguardTransitionInteractor.isInTransitionToState(KeyguardState.GONE)

                } else {

                    keyguardRepository.keyguardDoneAnimationsFinished.map { true }

                },

                keyguardTransitionInteractor.isInTransitionToState(KeyguardState.GONE),

                userRepository.selectedUser.map {

                    it.selectionStatus == SelectionStatus.SELECTION_IN_PROGRESS

                },