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

Commit c696d83e authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Initialize mLastAcquire, and check against it in wasUserDetected" into sc-dev am: ab0c4fbc 

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

Change-Id: Icd60cb84ccf3a43a9c820a1aaacc2661e74963e9
parents b711732e ab0c4fbc

services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ class FaceAuthenticationClient extends AuthenticationClient<ISession> implements 
    private final int[] mKeyguardIgnoreList;

    private final int[] mKeyguardIgnoreList;

    private final int[] mKeyguardIgnoreListVendor;

    private final int[] mKeyguardIgnoreListVendor;





    private int mLastAcquire;

    @FaceManager.FaceAcquired private int mLastAcquire = FaceManager.FACE_ACQUIRED_UNKNOWN;





    FaceAuthenticationClient(@NonNull Context context,

    FaceAuthenticationClient(@NonNull Context context,

            @NonNull LazyDaemon<ISession> lazyDaemon, @NonNull IBinder token,

            @NonNull LazyDaemon<ISession> lazyDaemon, @NonNull IBinder token,
@@ -127,7 +127,8 @@ class FaceAuthenticationClient extends AuthenticationClient<ISession> implements 
        // Do not provide haptic feedback if the user was not detected, and an error (usually

        // Do not provide haptic feedback if the user was not detected, and an error (usually

        // ERROR_TIMEOUT) is received.

        // ERROR_TIMEOUT) is received.

        return mLastAcquire != FaceManager.FACE_ACQUIRED_NOT_DETECTED

        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

    @Override