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

Commit 158fefb7 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

1/n: Add BiometricPrompt#setRequireConfirmation(bool) API 

Test: BiometricPrompt behaves as expected

Bug: 111461540
Change-Id: I84a298dedba368a9dade2835b71e641e524f45f4
parent 259e7840

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

+28 −0
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
     * @hide

     */

    public static final String KEY_NEGATIVE_TEXT = "negative_text";

    /**

     * @hide

     */

    public static final String KEY_REQUIRE_CONFIRMATION = "require_confirmation";



    /**

     * Error/help message will show for this amount of time.
@@ -214,6 +218,30 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
            return this;

        }



        /**

         * Optional: A hint to the system to require user confirmation after a biometric has been

         * authenticated. For example, implicit modalities like Face and Iris authentication are

         * passive, meaning they don't require an explicit user action to complete. When set to

         * 'false', the user action (e.g. pressing a button) will not be required. BiometricPrompt

         * will require confirmation by default.

         *

         * A typical use case for not requiring confirmation would be for low-risk transactions,

         * such as re-authenticating a recently authenticated application. A typical use case for

         * requiring confirmation would be for authorizing a purchase.

         *

         * Note that this is a hint to the system. The system may choose to ignore the flag. For

         * example, if the user disables implicit authentication in Settings, or if it does not

         * apply to a modality (e.g. Fingerprint). When ignored, the system will default to

         * requiring confirmation.

         *

         * @param requireConfirmation

         * @hide

         */

        public Builder setRequireConfirmation(boolean requireConfirmation) {

            mBundle.putBoolean(KEY_REQUIRE_CONFIRMATION, requireConfirmation);

            return this;

        }



        /**

         * Creates a {@link BiometricPrompt}.

         * @return a {@link BiometricPrompt}

packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogImpl.java

+4 −1
Original line number Diff line number Diff line
@@ -160,7 +160,10 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba 
    @Override

    public void showBiometricDialog(Bundle bundle, IBiometricServiceReceiverInternal receiver,

            int type, boolean requireConfirmation, int userId) {

        if (DEBUG) Log.d(TAG, "showBiometricDialog, type: " + type);

        if (DEBUG) {

            Log.d(TAG, "showBiometricDialog, type: " + type

                    + ", requireConfirmation: " + requireConfirmation);

        }

        // Remove these messages as they are part of the previous client

        mHandler.removeMessages(MSG_BIOMETRIC_ERROR);

        mHandler.removeMessages(MSG_BIOMETRIC_HELP);

services/core/java/com/android/server/biometrics/BiometricService.java

+6 −2
Original line number Diff line number Diff line
@@ -706,7 +706,8 @@ public class BiometricService extends SystemService { 


                mCurrentModality = modality;



                // Actually start authentication

                // Start preparing for authentication. Authentication starts when

                // all modalities requested have invoked onReadyForAuthentication.

                authenticateInternal(token, sessionId, userId, receiver, opPackageName, bundle,

                        callingUid, callingPid, callingUserId, modality);

            });
@@ -725,6 +726,9 @@ public class BiometricService extends SystemService { 
                IBiometricServiceReceiver receiver, String opPackageName, Bundle bundle,

                int callingUid, int callingPid, int callingUserId, int modality) {

            try {

                final boolean requireConfirmation = bundle.getBoolean(

                        BiometricPrompt.KEY_REQUIRE_CONFIRMATION, true /* default */);



                // Generate random cookies to pass to the services that should prepare to start

                // authenticating. Store the cookie here and wait for all services to "ack"

                // with the cookie. Once all cookies are received, we can show the prompt
@@ -748,7 +752,7 @@ public class BiometricService extends SystemService { 
                    Slog.w(TAG, "Iris unsupported");

                }

                if ((modality & TYPE_FACE) != 0) {

                    mFaceService.prepareForAuthentication(true /* requireConfirmation */,

                    mFaceService.prepareForAuthentication(requireConfirmation,

                            token, sessionId, userId, mInternalReceiver, opPackageName,

                            cookie, callingUid, callingPid, callingUserId);

                }

services/core/java/com/android/server/biometrics/face/FaceService.java

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public class FaceService extends BiometricServiceBase { 
                    mDaemonWrapper, mHalDeviceId, token,

                    new BiometricPromptServiceListenerImpl(wrapperReceiver),

                    mCurrentUserId, 0 /* groupId */, opId, restricted, opPackageName, cookie,

                    true /* requireConfirmation */);

                    requireConfirmation);

            authenticateInternal(client, opId, opPackageName, callingUid, callingPid,

                    callingUserId);

        }