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

Commit 0dae9817 authored by Chandru S's avatar Chandru S
Browse files

Clear face auth locked out state after user switch. 

If the new user doesn't have face auth locked out we should reset the state.

Fixes: 299164873
Test: atest KeyguardFaceAuthInteractorTest
Test: atest DeviceEntryFaceAuthRepositoryTest
Change-Id: Id18e192c3fe41314f9620e7d654d6e1faf8fc24b
parent 30ddae31

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

+3 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ interface DeviceEntryFaceAuthRepository { 
    val isBypassEnabled: Flow<Boolean>



    /** Set whether face authentication should be locked out or not */

    fun lockoutFaceAuth()

    fun setLockedOut(isLockedOut: Boolean)



    /**

     * Cancel current face authentication and prevent it from running until [resumeFaceAuth] is
@@ -228,8 +228,8 @@ constructor( 
        }

            ?: flowOf(false)



    override fun lockoutFaceAuth() {

        _isLockedOut.value = true

    override fun setLockedOut(isLockedOut: Boolean) {

        _isLockedOut.value = isLockedOut

    }



    private val faceLockoutResetCallback =

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/NoopDeviceEntryFaceAuthRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ class NoopDeviceEntryFaceAuthRepository @Inject constructor() : DeviceEntryFaceA 
    override val isBypassEnabled: Flow<Boolean>

        get() = emptyFlow()



    override fun lockoutFaceAuth() = Unit

    override fun setLockedOut(isLockedOut: Boolean) = Unit

    override fun pauseFaceAuth() = Unit



    override fun resumeFaceAuth() = Unit

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

+4 −4
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ constructor( 
            .onEach {

                if (it) {

                    faceAuthenticationLogger.faceLockedOut("Fingerprint locked out")

                    repository.lockoutFaceAuth()

                    repository.setLockedOut(true)

                }

            }

            .launchIn(applicationScope)
@@ -148,9 +148,9 @@ constructor( 
                    repository.pauseFaceAuth()

                } else if (wasSwitching && !isSwitching) {

                    val lockoutMode = facePropertyRepository.getLockoutMode(curr.userInfo.id)

                    if (lockoutMode == LockoutMode.PERMANENT || lockoutMode == LockoutMode.TIMED) {

                        repository.lockoutFaceAuth()

                    }

                    repository.setLockedOut(

                        lockoutMode == LockoutMode.PERMANENT || lockoutMode == LockoutMode.TIMED

                    )

                    repository.resumeFaceAuth()

                    yield()

                    runFaceAuth(

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepositoryTest.kt

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


    @Test

    fun authenticateDoesNotRunWhenFaceIsDisabled() =

        testScope.runTest { testGatingCheckForFaceAuth { underTest.lockoutFaceAuth() } }

        testScope.runTest { testGatingCheckForFaceAuth { underTest.setLockedOut(true) } }



    @Test

    fun authenticateDoesNotRunWhenUserIsCurrentlyTrusted() =
@@ -869,7 +869,7 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { 
            initCollectors()

            assertThat(underTest.isLockedOut.value).isFalse()



            underTest.lockoutFaceAuth()

            underTest.setLockedOut(true)

            runCurrent()



            assertThat(underTest.isLockedOut.value).isTrue()

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

+8 −5
Original line number Diff line number Diff line
@@ -244,15 +244,18 @@ class KeyguardFaceAuthInteractorTest : SysuiTestCase() { 
        testScope.runTest {

            underTest.start()



            // previously running

            // User switching has started

            fakeUserRepository.setSelectedUserInfo(primaryUser, SelectionStatus.SELECTION_COMPLETE)

            fakeUserRepository.setSelectedUserInfo(

                primaryUser,

                SelectionStatus.SELECTION_IN_PROGRESS

            )

            runCurrent()

            bouncerRepository.setPrimaryShow(true)

            assertThat(faceAuthRepository.isFaceAuthPaused()).isTrue()



            facePropertyRepository.setLockoutMode(secondaryUser.id, LockoutMode.TIMED)

            bouncerRepository.setPrimaryShow(true)

            // New user is not locked out.

            facePropertyRepository.setLockoutMode(secondaryUser.id, LockoutMode.NONE)

            fakeUserRepository.setSelectedUserInfo(

                secondaryUser,

                SelectionStatus.SELECTION_COMPLETE
@@ -260,7 +263,7 @@ class KeyguardFaceAuthInteractorTest : SysuiTestCase() { 
            runCurrent()



            assertThat(faceAuthRepository.isFaceAuthPaused()).isFalse()

            assertThat(faceAuthRepository.wasDisabled).isTrue()

            assertThat(faceAuthRepository.isLockedOut.value).isFalse()



            runCurrent()

            assertThat(faceAuthRepository.runningAuthRequest.value!!.first)
@@ -406,7 +409,7 @@ class KeyguardFaceAuthInteractorTest : SysuiTestCase() { 
            fakeDeviceEntryFingerprintAuthRepository.setLockedOut(true)

            runCurrent()



            assertThat(faceAuthRepository.wasDisabled).isTrue()

            assertThat(faceAuthRepository.isLockedOut.value).isTrue()

        }



    companion object {