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

Commit e6267152 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove SessionState and cookie from biometrics" into sc-dev am: 55a5d061 

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

Change-Id: Id19c63af6e960af2d3b810865134398b93c7edad
parents 0c21e87c 55a5d061

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

+5 −3
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ public abstract class BaseClientMonitor extends LoggableMonitor 
         *

         * @param clientMonitor Reference of the ClientMonitor that is starting.

         */

        default void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {}

        default void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {

        }



        /**

         * Invoked when the ClientMonitor operation is complete. This abstracts away asynchronous
@@ -63,10 +64,11 @@ public abstract class BaseClientMonitor extends LoggableMonitor 
         * @param clientMonitor Reference of the ClientMonitor that finished.

         * @param success True if the operation completed successfully.

         */

        default void onClientFinished(@NonNull BaseClientMonitor clientMonitor, boolean success) {}

        default void onClientFinished(@NonNull BaseClientMonitor clientMonitor, boolean success) {

        }

    }



    protected final int mSequentialId;

    private final int mSequentialId;

    @NonNull private final Context mContext;

    private final int mTargetUserId;

    @NonNull private final String mOwner;

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

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ class FaceAuthenticationClient extends AuthenticationClient<ISession> implements 
    @Override

    protected void startHalOperation() {

        try {

            mCancellationSignal = getFreshDaemon().authenticate(mSequentialId, mOperationId);

            mCancellationSignal = getFreshDaemon().authenticate(mOperationId);

        } catch (RemoteException e) {

            Slog.e(TAG, "Remote exception when requesting auth", e);

            onError(BiometricFaceConstants.FACE_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */);

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

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public class FaceEnrollClient extends EnrollClient<ISession> { 
                features = new byte[0];

            }



            mCancellationSignal = getFreshDaemon().enroll(mSequentialId,

            mCancellationSignal = getFreshDaemon().enroll(

                    HardwareAuthTokenUtils.toHardwareAuthToken(mHardwareAuthToken),

                    EnrollmentType.DEFAULT, features, mPreviewSurface);

        } catch (RemoteException e) {

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public class FaceGenerateChallengeClient extends GenerateChallengeClient<ISessio 
    @Override

    protected void startHalOperation() {

        try {

            getFreshDaemon().generateChallenge(mSequentialId);

            getFreshDaemon().generateChallenge();

        } catch (RemoteException e) {

            Slog.e(TAG, "Unable to generateChallenge", e);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ class FaceGetAuthenticatorIdClient extends HalClientMonitor<ISession> { 
    @Override

    protected void startHalOperation() {

        try {

            getFreshDaemon().getAuthenticatorId(mSequentialId);

            getFreshDaemon().getAuthenticatorId();

        } catch (RemoteException e) {

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

        }