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

Commit f67bff31 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Finish FaceAuthClient onLockout" into udc-dev am: 3010f829 am: 2fe5bd21 

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



Change-Id: I06a244252a0ea707c81d78c722af9c959523b8c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5cf71ae4 2fe5bd21

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

+4 −10
Original line number Diff line number Diff line
@@ -212,6 +212,8 @@ class FaceAuthenticationClient extends AuthenticationClient<AidlSession, FaceAut 
        // 1) Authenticated == true

        // 2) Error occurred

        // 3) Authenticated == false

        // 4) onLockout

        // 5) onLockoutTimed

        mCallback.onClientFinished(this, true /* success */);

    }
@@ -304,11 +306,7 @@ class FaceAuthenticationClient extends AuthenticationClient<AidlSession, FaceAut 
        PerformanceTracker.getInstanceForSensorId(getSensorId())

                .incrementTimedLockoutForUser(getTargetUserId());



        try {

            getListener().onError(getSensorId(), getCookie(), error, 0 /* vendorCode */);

        } catch (RemoteException e) {

            Slog.e(TAG, "Remote exception", e);

        }

        onError(error, 0 /* vendorCode */);

    }



    @Override
@@ -323,10 +321,6 @@ class FaceAuthenticationClient extends AuthenticationClient<AidlSession, FaceAut 
        PerformanceTracker.getInstanceForSensorId(getSensorId())

                .incrementPermanentLockoutForUser(getTargetUserId());



        try {

            getListener().onError(getSensorId(), getCookie(), error, 0 /* vendorCode */);

        } catch (RemoteException e) {

            Slog.e(TAG, "Remote exception", e);

        }

        onError(error, 0 /* vendorCode */);

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ public class FaceProvider implements IBinder.DeathRecipient, ServiceProvider { 
                        BaseClientMonitor clientMonitor,

                        boolean success) {

                    mAuthSessionCoordinator.authEndedFor(userId, Utils.getCurrentStrength(sensorId),

                            sensorId, requestId, success);

                            sensorId, requestId, client.wasAuthSuccessful());

                }

            });

        });

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

+24 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


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



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;
@@ -147,6 +149,28 @@ 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();