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

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

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

parents 5447f715 9fbdacf8

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

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

        }





    @Test

    @Test

    fun isAuthenticatedIsResetToFalseWhenTransitioningToGone() =

    fun isAuthenticatedIsResetToFalseWhenKeyguardDoneAnimationsFinished() =

        testScope.runTest {

        testScope.runTest {

            initCollectors()

            initCollectors()

            allPreconditionsToRunFaceAuthAreTrue()

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




            assertThat(authenticated()).isTrue()

            assertThat(authenticated()).isTrue()





            keyguardTransitionRepository.sendTransitionStep(

            keyguardRepository.keyguardDoneAnimationsFinished()

                TransitionStep(

                    transitionState = TransitionState.STARTED,

                    from = KeyguardState.LOCKSCREEN,

                    to = KeyguardState.GONE,

                )

            )





            assertThat(authenticated()).isFalse()

            assertThat(authenticated()).isFalse()

        }

        }

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

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

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

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

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

import com.android.systemui.dump.DumpManager

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.BiometricSettingsRepository

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

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

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

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

        // or device starts going to sleep.

        merge(

        merge(

                powerInteractor.isAsleep,

                powerInteractor.isAsleep,

                keyguardTransitionInteractor.isInTransitionToState(KeyguardState.GONE),

                if (KeyguardWmStateRefactor.isEnabled) {

                    keyguardTransitionInteractor.isInTransitionToState(KeyguardState.GONE)

                } else {

                    keyguardRepository.keyguardDoneAnimationsFinished.map { true }

                },

                userRepository.selectedUser.map {

                userRepository.selectedUser.map {

                    it.selectionStatus == SelectionStatus.SELECTION_IN_PROGRESS

                    it.selectionStatus == SelectionStatus.SELECTION_IN_PROGRESS

                },

                },