From 37b214b8c61342f99c342bc3e68b953ddf452f74 Mon Sep 17 00:00:00 2001
From: Chandru S <chandruis@google.com>
Date: Fri, 23 Jun 2023 09:23:20 -0700
Subject: [PATCH 1/2] Do not make device is asleep a gating condition for face
 auth

This prevents face auth from running when the user touches the UDFPS sensor on AOD
The device would still be asleep but we still want to run face auth.

This also fixes race conditions between device asleep still being true when we trigger face auth by lifting the device or tapping the device to wake up.

Fixes: 285499709
Fixes: 285501230

Test: atest DeviceEntryFaceAuthRepositoryTest
Change-Id: Ieaef83a2695de1c2d369068b4db08df5acb2357d
---
 .../repository/DeviceEntryFaceAuthRepository.kt    |  4 ++--
 .../DeviceEntryFaceAuthRepositoryTest.kt           | 14 --------------
 2 files changed, 2 insertions(+), 16 deletions(-)

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 128057ae6b621..b17661db353ac 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
@@ -312,8 +312,8 @@ constructor(
                     tableLogBuffer
                 ),
                 logAndObserve(
-                    keyguardRepository.wakefulness.map { it.isStartingToSleepOrAsleep() }.isFalse(),
-                    "deviceNotSleepingOrNotStartingToSleep",
+                    keyguardRepository.wakefulness.map { it.isStartingToSleep() }.isFalse(),
+                    "deviceNotStartingToSleep",
                     tableLogBuffer
                 ),
                 logAndObserve(
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 5922cbf6268e0..8e6adb41d4a8f 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
@@ -550,20 +550,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 {

From 9296cf0a50d9986d4c1dcfb98f7a7ba9ebd8e7d0 Mon Sep 17 00:00:00 2001
From: Chandru S <chandruis@google.com>
Date: Fri, 23 Jun 2023 10:32:06 -0700
Subject: [PATCH 2/2] 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) {