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

Commit 6474964c authored by Chandru S's avatar Chandru S
Browse files

Prevent running face detection when shade is expanded 

When face auth cannot run due to strong auth restrictions, and face bypass is enabled, face detection is run to navigate the user to the bouncer

Bug: NA
Test: atest DeviceEntryFaceAuthInteractorTest
Flag: EXEMPT bugfix
Test: manually,
 1. Enable face auth, with bypass
 2. Restart the device, face auth should not run
 3. Pull down the shade
 4. face detection should not run
Change-Id: Ie8d984e31bca4d0e752e28fa85055c84f7731519
parent 0710dfd7

packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/SystemUIDeviceEntryFaceAuthInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ constructor( 
    }



    override fun onShadeExpansionStarted() {

        runFaceAuth(FaceAuthUiEvent.FACE_AUTH_TRIGGERED_QS_EXPANDED, true)

        runFaceAuth(FaceAuthUiEvent.FACE_AUTH_TRIGGERED_QS_EXPANDED, false)

    }



    override fun onDeviceLifted() {

packages/SystemUI/tests/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryFaceAuthInteractorTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ class DeviceEntryFaceAuthInteractorTest : SysuiTestCase() { 


            runCurrent()

            assertThat(faceAuthRepository.runningAuthRequest.value)

                .isEqualTo(Pair(FaceAuthUiEvent.FACE_AUTH_TRIGGERED_QS_EXPANDED, true))

                .isEqualTo(Pair(FaceAuthUiEvent.FACE_AUTH_TRIGGERED_QS_EXPANDED, false))

        }



    @Test
@@ -398,7 +398,7 @@ class DeviceEntryFaceAuthInteractorTest : SysuiTestCase() { 


            runCurrent()

            assertThat(faceAuthRepository.runningAuthRequest.value)

                .isEqualTo(Pair(FaceAuthUiEvent.FACE_AUTH_TRIGGERED_QS_EXPANDED, true))

                .isEqualTo(Pair(FaceAuthUiEvent.FACE_AUTH_TRIGGERED_QS_EXPANDED, false))

        }



    @Test
@@ -426,7 +426,7 @@ class DeviceEntryFaceAuthInteractorTest : SysuiTestCase() { 


            runCurrent()

            assertThat(faceAuthRepository.runningAuthRequest.value)

                .isEqualTo(Pair(FaceAuthUiEvent.FACE_AUTH_TRIGGERED_QS_EXPANDED, true))

                .isEqualTo(Pair(FaceAuthUiEvent.FACE_AUTH_TRIGGERED_QS_EXPANDED, false))

            faceAuthRepository.runningAuthRequest.value = null



            // expansion progress shouldn't trigger face auth again