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

Commit 0c320ca0 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

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
parent 4c83e679

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