From 0c320ca0b67583574407988192af59194d023bed Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Tue, 18 May 2021 17:08:27 -0700 Subject: [PATCH] Initialize mLastAcquire, and check against it in wasUserDetected In framework definition, FACE_ACQUIRED_GOOD = 0. We should initialize mLastAcquire to FACE_ACQUIRED_UNKNOWN (23) Bug: 187007935 Test: Builds Change-Id: Ie601d2a9ac77e8b8135f7f3d36f2eb8d1c467d98 --- .../sensors/face/aidl/FaceAuthenticationClient.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 d04c17cdb6d3d..2ab1285ba8a75 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 @@ -68,7 +68,7 @@ class FaceAuthenticationClient extends AuthenticationClient implements private final int[] mKeyguardIgnoreList; private final int[] mKeyguardIgnoreListVendor; - private int mLastAcquire; + @FaceManager.FaceAcquired private int mLastAcquire = FaceManager.FACE_ACQUIRED_UNKNOWN; FaceAuthenticationClient(@NonNull Context context, @NonNull LazyDaemon lazyDaemon, @NonNull IBinder token, @@ -127,7 +127,8 @@ class FaceAuthenticationClient extends AuthenticationClient implements // Do not provide haptic feedback if the user was not detected, and an error (usually // ERROR_TIMEOUT) is received. return mLastAcquire != FaceManager.FACE_ACQUIRED_NOT_DETECTED - && mLastAcquire != FaceManager.FACE_ACQUIRED_SENSOR_DIRTY; + && mLastAcquire != FaceManager.FACE_ACQUIRED_SENSOR_DIRTY + && mLastAcquire != FaceManager.FACE_ACQUIRED_UNKNOWN; } @Override