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

Commit b4fb88d4 authored by Chandru S's avatar Chandru S Committed by Automerger Merge Worker
Browse files

Merge changes I2536ae30,Ieaef83a2 into udc-qpr-dev am: f2d674bc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23782492



Change-Id: If6e3837a8726d40c0326417154a8a41848c9b8fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a864b0f3 f2d674bc

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

+3 −2
Original line number Diff line number Diff line
@@ -312,8 +312,8 @@ constructor( 
                    tableLogBuffer

                ),

                logAndObserve(

                    keyguardRepository.wakefulness.map { it.isStartingToSleepOrAsleep() }.isFalse(),

                    "deviceNotSleepingOrNotStartingToSleep",

                    keyguardRepository.wakefulness.map { it.isStartingToSleep() }.isFalse(),

                    "deviceNotStartingToSleep",

                    tableLogBuffer

                ),

                logAndObserve(
@@ -365,6 +365,7 @@ constructor( 
                    "nonStrongBiometricIsAllowed",

                    faceAuthLog

                ),

                logAndObserve(isAuthenticated.isFalse(), "faceNotAuthenticated", faceAuthLog),

            )

            .reduce(::and)

            .distinctUntilChanged()

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

+1 −14
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { 
            assertThat(authStatus()).isEqualTo(SuccessAuthenticationStatus(successResult))

            assertThat(authenticated()).isTrue()

            assertThat(authRunning()).isFalse()

            assertThat(canFaceAuthRun()).isFalse()

        }



    private fun uiEventIsLogged(faceAuthUiEvent: FaceAuthUiEvent) {
@@ -550,20 +551,6 @@ class DeviceEntryFaceAuthRepositoryTest : SysuiTestCase() { 
            }

        }



    @Test

    fun authenticateDoesNotRunWhenDeviceIsSleeping() =

        testScope.runTest {

            testGatingCheckForFaceAuth {

                keyguardRepository.setWakefulnessModel(

                    WakefulnessModel(

                        state = WakefulnessState.ASLEEP,

                        lastWakeReason = WakeSleepReason.OTHER,

                        lastSleepReason = WakeSleepReason.OTHER,

                    )

                )

            }

        }



    @Test

    fun authenticateDoesNotRunWhenNonStrongBiometricIsNotAllowed() =

        testScope.runTest {