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

Commit 0e4974d5 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Don't send cancel after client finished" into udc-d1-dev

parents 74fe8672 19ccb4a5

services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java

+6 −2
Original line number Diff line number Diff line
@@ -266,8 +266,12 @@ public abstract class AuthenticationClient<T, O extends AuthenticateOptions> 
            }

        } else {

            if (isBackgroundAuth) {

                Slog.e(TAG, "cancelling due to background auth");

                cancel();

                Slog.e(TAG, "Sending cancel to client(Due to background auth)");

                if (mTaskStackListener != null) {

                    mActivityTaskManager.unregisterTaskStackListener(mTaskStackListener);

                }

                sendCancelOnly(getListener());

                mCallback.onClientFinished(this, false);

            } else {

                // Allow system-defined limit of number of attempts before giving up

                if (mShouldUseLockoutTracker) {

services/tests/servicestests/src/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClientTest.java

+5 −1
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ 


package com.android.server.biometrics.sensors.face.aidl;



import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_ERROR_CANCELED;

import static android.hardware.biometrics.BiometricFaceConstants.FACE_ERROR_LOCKOUT;

import static android.hardware.biometrics.BiometricFaceConstants.FACE_ERROR_LOCKOUT_PERMANENT;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;
@@ -205,7 +207,9 @@ public class FaceAuthenticationClientTest { 
        client.onAuthenticated(new Face("friendly", 1 /* faceId */, 2 /* deviceId */),

                true /* authenticated */, new ArrayList<>());



        verify(mCancellationSignal).cancel();

        verify(mCancellationSignal, never()).cancel();

        verify(mClientMonitorCallbackConverter)

                .onError(anyInt(), anyInt(), eq(BIOMETRIC_ERROR_CANCELED), anyInt());

    }



    private FaceAuthenticationClient createClient() throws RemoteException {

services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClientTest.java

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server.biometrics.sensors.fingerprint.aidl;



import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_ERROR_CANCELED;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -399,7 +401,9 @@ public class FingerprintAuthenticationClientTest { 


        mLooper.moveTimeForward(10);

        mLooper.dispatchAll();

        verify(mCancellationSignal).cancel();

        verify(mCancellationSignal, never()).cancel();

        verify(mClientMonitorCallbackConverter)

                .onError(anyInt(), anyInt(), eq(BIOMETRIC_ERROR_CANCELED), anyInt());

    }



    private FingerprintAuthenticationClient createClient() throws RemoteException {