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

Commit 9fbdacf8 authored by Beverly Tai's avatar Beverly Tai Committed by Beverly
Browse files

Revert "Reset the face authenticated state when transitioning to GONE" 

This reverts commit 48f82c23.

Reason for revert: b/333404879
Fixes: 333404879
Bug: 330117158

Change-Id: Ib2f0615a30019ac40412d48b11c6ca5b79bec5b0
parent ecad616a

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

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



    @Test

    fun isAuthenticatedIsResetToFalseWhenTransitioningToGone() =

    fun isAuthenticatedIsResetToFalseWhenKeyguardDoneAnimationsFinished() =

        testScope.runTest {

            initCollectors()

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


            assertThat(authenticated()).isTrue()



            keyguardTransitionRepository.sendTransitionStep(

                TransitionStep(

                    transitionState = TransitionState.STARTED,

                    from = KeyguardState.LOCKSCREEN,

                    to = KeyguardState.GONE,

                )

            )

            keyguardRepository.keyguardDoneAnimationsFinished()



            assertThat(authenticated()).isFalse()

        }

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

+6 −1
Original line number 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.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
@@ -312,7 +313,11 @@ constructor( 
        // or device starts going to sleep.

        merge(

                powerInteractor.isAsleep,

                keyguardTransitionInteractor.isInTransitionToState(KeyguardState.GONE),

                if (KeyguardWmStateRefactor.isEnabled) {

                    keyguardTransitionInteractor.isInTransitionToState(KeyguardState.GONE)

                } else {

                    keyguardRepository.keyguardDoneAnimationsFinished.map { true }

                },

                userRepository.selectedUser.map {

                    it.selectionStatus == SelectionStatus.SELECTION_IN_PROGRESS

                },