From 9296cf0a50d9986d4c1dcfb98f7a7ba9ebd8e7d0 Mon Sep 17 00:00:00 2001 From: Chandru S Date: Fri, 23 Jun 2023 10:32:06 -0700 Subject: [PATCH] Do not run face auth if keyguard is already authenticated with face. Fixes: 285518497 Test: atest DeviceEntryFaceAuthRepositoryTest Change-Id: I2536ae302b6b7d240e931b51698ac125bd1668ea --- .../keyguard/data/repository/DeviceEntryFaceAuthRepository.kt | 1 + .../data/repository/DeviceEntryFaceAuthRepositoryTest.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepository.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepository.kt index b17661db353ac..197929cb638c0 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepository.kt @@ -365,6 +365,7 @@ constructor( "nonStrongBiometricIsAllowed", faceAuthLog ), + logAndObserve(isAuthenticated.isFalse(), "faceNotAuthenticated", faceAuthLog), ) .reduce(::and) .distinctUntilChanged() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepositoryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepositoryTest.kt index 8e6adb41d4a8f..9eef793057aa3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepositoryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/DeviceEntryFaceAuthRepositoryTest.kt @@ -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) {