From bebffbf3fbf2a3591e729e0ba5351aec4a79d313 Mon Sep 17 00:00:00 2001
From: Joshua Mccloskey <joshmccloskey@google.com>
Date: Fri, 2 Jun 2023 00:24:16 +0000
Subject: [PATCH] Revert "Finish FaceAuthClient onLockout"

This reverts commit 9f26c90ffbdb62cfc930540e478ecabee2f8b070.

Reason for revert: Going to push into d1-dev for more soak time

Change-Id: I9151084a896d0cbd7a714104d6ebab60609dba6b
---
 .../face/aidl/FaceAuthenticationClient.java   | 14 ++++++++----
 .../sensors/face/aidl/FaceProvider.java       |  2 +-
 .../aidl/FaceAuthenticationClientTest.java    | 22 -------------------
 3 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java
index 50d375c56f4a9..7ae31b2a114da 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java
@@ -212,8 +212,6 @@ class FaceAuthenticationClient extends AuthenticationClient<AidlSession, FaceAut
         // 1) Authenticated == true
         // 2) Error occurred
         // 3) Authenticated == false
-        // 4) onLockout
-        // 5) onLockoutTimed
         mCallback.onClientFinished(this, true /* success */);
     }
 
@@ -306,7 +304,11 @@ class FaceAuthenticationClient extends AuthenticationClient<AidlSession, FaceAut
         PerformanceTracker.getInstanceForSensorId(getSensorId())
                 .incrementTimedLockoutForUser(getTargetUserId());
 
-        onError(error, 0 /* vendorCode */);
+        try {
+            getListener().onError(getSensorId(), getCookie(), error, 0 /* vendorCode */);
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Remote exception", e);
+        }
     }
 
     @Override
@@ -321,6 +323,10 @@ class FaceAuthenticationClient extends AuthenticationClient<AidlSession, FaceAut
         PerformanceTracker.getInstanceForSensorId(getSensorId())
                 .incrementPermanentLockoutForUser(getTargetUserId());
 
-        onError(error, 0 /* vendorCode */);
+        try {
+            getListener().onError(getSensorId(), getCookie(), error, 0 /* vendorCode */);
+        } catch (RemoteException e) {
+            Slog.e(TAG, "Remote exception", e);
+        }
     }
 }
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java
index a501647184179..d6b6f771b8611 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java
@@ -475,7 +475,7 @@ public class FaceProvider implements IBinder.DeathRecipient, ServiceProvider {
                         BaseClientMonitor clientMonitor,
                         boolean success) {
                     mAuthSessionCoordinator.authEndedFor(userId, Utils.getCurrentStrength(sensorId),
-                            sensorId, requestId, client.wasAuthSuccessful());
+                            sensorId, requestId, success);
                 }
             });
         });
diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java
index 046b01c831b50..359d711c0750b 100644
--- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java
+++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java
@@ -151,28 +151,6 @@ public class FaceAuthenticationClientTest {
         verify(mHal, never()).authenticate(anyLong());
     }
 
-    @Test
-    public void testLockoutEndsOperation() throws RemoteException {
-        final FaceAuthenticationClient client = createClient(2);
-        client.start(mCallback);
-        client.onLockoutPermanent();
-
-        verify(mClientMonitorCallbackConverter).onError(anyInt(), anyInt(),
-                eq(FACE_ERROR_LOCKOUT_PERMANENT), anyInt());
-        verify(mCallback).onClientFinished(client, false);
-    }
-
-    @Test
-    public void testTemporaryLockoutEndsOperation() throws RemoteException {
-        final FaceAuthenticationClient client = createClient(2);
-        client.start(mCallback);
-        client.onLockoutTimed(1000);
-
-        verify(mClientMonitorCallbackConverter).onError(anyInt(), anyInt(),
-                eq(FACE_ERROR_LOCKOUT), anyInt());
-        verify(mCallback).onClientFinished(client, false);
-    }
-
     @Test
     public void notifyHalWhenContextChanges() throws RemoteException {
         final FaceAuthenticationClient client = createClient();