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

Commit 3d9b0fc9 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge changes from topic "biometric-refactor" 

* changes:
  3/n: For passive modalities, add plumbing for "try again"
  2/n: Multi-modal support for BiometricPrompt
  1/n: Move BiometricDialog management to BiometricService
parents 96b3e880 23289ef7

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -158,9 +158,9 @@ java_defaults { 
        "core/java/android/hardware/IConsumerIrService.aidl",

        "core/java/android/hardware/ISerialManager.aidl",

        "core/java/android/hardware/biometrics/IBiometricEnabledOnKeyguardCallback.aidl",

        "core/java/android/hardware/biometrics/IBiometricPromptReceiver.aidl",

        "core/java/android/hardware/biometrics/IBiometricService.aidl",

        "core/java/android/hardware/biometrics/IBiometricServiceReceiver.aidl",

        "core/java/android/hardware/biometrics/IBiometricServiceReceiverInternal.aidl",

        "core/java/android/hardware/biometrics/IBiometricServiceLockoutResetCallback.aidl",

        "core/java/android/hardware/display/IDisplayManager.aidl",

        "core/java/android/hardware/display/IDisplayManagerCallback.aidl",

core/java/android/hardware/biometrics/BiometricAuthenticator.java

+13 −3
Original line number Diff line number Diff line
@@ -30,19 +30,29 @@ import java.util.concurrent.Executor; 
public interface BiometricAuthenticator {



    /**

     * No biometric methods or nothing has been enrolled.

     * Move/expose these in BiometricPrompt if we ever want to allow applications to "blacklist"

     * modalities when calling authenticate().

     * @hide

     */

    int TYPE_FINGERPRINT = 1;

    int TYPE_NONE = 0;

    /**

     * Constant representing fingerprint.

     * @hide

     */

    int TYPE_FINGERPRINT = 1 << 0;



    /**

     * Constant representing iris.

     * @hide

     */

    int TYPE_IRIS = 2;

    int TYPE_IRIS = 1 << 1;



    /**

     * Constant representing face.

     * @hide

     */

    int TYPE_FACE = 3;

    int TYPE_FACE = 1 << 2;



    /**

     * Container for biometric data

core/java/android/hardware/biometrics/BiometricPrompt.java

+21 −25
Original line number Diff line number Diff line
@@ -251,27 +251,11 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
    private Executor mExecutor;

    private AuthenticationCallback mAuthenticationCallback;



    IBiometricPromptReceiver mDialogReceiver = new IBiometricPromptReceiver.Stub() {

        @Override

        public void onDialogDismissed(int reason) {

            // Check the reason and invoke OnClickListener(s) if necessary

            if (reason == DISMISSED_REASON_POSITIVE) {

                mPositiveButtonInfo.executor.execute(() -> {

                    mPositiveButtonInfo.listener.onClick(null, DialogInterface.BUTTON_POSITIVE);

                });

            } else if (reason == DISMISSED_REASON_NEGATIVE) {

                mNegativeButtonInfo.executor.execute(() -> {

                    mNegativeButtonInfo.listener.onClick(null, DialogInterface.BUTTON_NEGATIVE);

                });

            }

        }

    };



    IBiometricServiceReceiver mBiometricServiceReceiver =

    private final IBiometricServiceReceiver mBiometricServiceReceiver =

            new IBiometricServiceReceiver.Stub() {



        @Override

        public void onAuthenticationSucceeded(long deviceId) throws RemoteException {

        public void onAuthenticationSucceeded() throws RemoteException {

            mExecutor.execute(() -> {

                final AuthenticationResult result = new AuthenticationResult(mCryptoObject);

                mAuthenticationCallback.onAuthenticationSucceeded(result);
@@ -279,26 +263,39 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
        }



        @Override

        public void onAuthenticationFailed(long deviceId) throws RemoteException {

        public void onAuthenticationFailed() throws RemoteException {

            mExecutor.execute(() -> {

                mAuthenticationCallback.onAuthenticationFailed();

            });

        }



        @Override

        public void onError(long deviceId, int error, String message)

                throws RemoteException {

        public void onError(int error, String message) throws RemoteException {

            mExecutor.execute(() -> {

                mAuthenticationCallback.onAuthenticationError(error, message);

            });

        }



        @Override

        public void onAcquired(long deviceId, int acquireInfo, String message) {

        public void onAcquired(int acquireInfo, String message) throws RemoteException {

            mExecutor.execute(() -> {

                mAuthenticationCallback.onAuthenticationHelp(acquireInfo, message);

            });

        }



        @Override

        public void onDialogDismissed(int reason) throws RemoteException {

            // Check the reason and invoke OnClickListener(s) if necessary

            if (reason == DISMISSED_REASON_POSITIVE) {

                mPositiveButtonInfo.executor.execute(() -> {

                    mPositiveButtonInfo.listener.onClick(null, DialogInterface.BUTTON_POSITIVE);

                });

            } else if (reason == DISMISSED_REASON_NEGATIVE) {

                mNegativeButtonInfo.executor.execute(() -> {

                    mNegativeButtonInfo.listener.onClick(null, DialogInterface.BUTTON_NEGATIVE);

                });

            }

        }

    };



    private BiometricPrompt(Context context, Bundle bundle,
@@ -557,9 +554,8 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
            mExecutor = executor;

            mAuthenticationCallback = callback;

            final long sessionId = crypto != null ? crypto.getOpId() : 0;

            mService.authenticate(mToken, sessionId, userId,

                    mBiometricServiceReceiver, 0 /* flags */, mContext.getOpPackageName(),

                    mBundle, mDialogReceiver);

            mService.authenticate(mToken, sessionId, userId, mBiometricServiceReceiver,

                    mContext.getOpPackageName(), mBundle);

        } catch (RemoteException e) {

            Log.e(TAG, "Remote exception while authenticating", e);

            mExecutor.execute(() -> {

core/java/android/hardware/biometrics/IBiometricService.aidl

+5 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.hardware.biometrics; 


import android.os.Bundle;

import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback;

import android.hardware.biometrics.IBiometricPromptReceiver;

import android.hardware.biometrics.IBiometricServiceReceiver;



/**
@@ -32,8 +31,7 @@ interface IBiometricService { 
    // Requests authentication. The service choose the appropriate biometric to use, and show

    // the corresponding BiometricDialog.

    void authenticate(IBinder token, long sessionId, int userId,

            IBiometricServiceReceiver receiver, int flags, String opPackageName,

            in Bundle bundle, IBiometricPromptReceiver dialogReceiver);

            IBiometricServiceReceiver receiver, String opPackageName, in Bundle bundle);



    // Cancel authentication for the given sessionId

    void cancelAuthentication(IBinder token, String opPackageName);
@@ -46,4 +44,8 @@ interface IBiometricService { 


    // Explicitly set the active user.

    void setActiveUser(int userId);



    // Notify BiometricService when <Biometric>Service is ready to start the prepared client.

    // Client lifecycle is still managed in <Biometric>Service.

    void onReadyForAuthentication(int cookie, boolean requireConfirmation, int userId);

}

core/java/android/hardware/biometrics/IBiometricServiceReceiver.aidl

+11 −5
Original line number Diff line number Diff line
@@ -16,12 +16,18 @@ 
package android.hardware.biometrics;



/**

 * Communication channel from the BiometricService back to BiometricPrompt.

 * Communication channel from BiometricService back to BiometricPrompt

 * @hide

 */

oneway interface IBiometricServiceReceiver {

    void onAuthenticationSucceeded(long deviceId);

    void onAuthenticationFailed(long deviceId);

    void onError(long deviceId, int error, String message);

    void onAcquired(long deviceId, int acquiredInfo, String message);

    // Notify BiometricPrompt that authentication was successful

    void onAuthenticationSucceeded();

    // Noties that authentication failed.

    void onAuthenticationFailed();

    // Notify BiometricPrompt that an error has occurred.

    void onError(int error, String message);

    // Notifies that a biometric has been acquired.

    void onAcquired(int acquiredInfo, String message);

    // Notifies that the SystemUI dialog has been dismissed.

    void onDialogDismissed(int reason);

}