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

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

Merge "Update BiometricPrompt API annotations and comments"

parents 2ab8a889 91688c2d

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -16559,10 +16559,10 @@ package android.hardware.biometrics { 
  public static class BiometricPrompt.Builder {

    ctor public BiometricPrompt.Builder(android.content.Context);

    method public android.hardware.biometrics.BiometricPrompt build();

    method public android.hardware.biometrics.BiometricPrompt.Builder setAllowDeviceCredential(boolean);

    method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setAllowDeviceCredential(boolean);

    method public android.hardware.biometrics.BiometricPrompt.Builder setDescription(@NonNull CharSequence);

    method public android.hardware.biometrics.BiometricPrompt.Builder setNegativeButton(@NonNull CharSequence, @NonNull java.util.concurrent.Executor, @NonNull android.content.DialogInterface.OnClickListener);

    method public android.hardware.biometrics.BiometricPrompt.Builder setRequireConfirmation(boolean);

    method @NonNull public android.hardware.biometrics.BiometricPrompt.Builder setRequireConfirmation(boolean);

    method public android.hardware.biometrics.BiometricPrompt.Builder setSubtitle(@NonNull CharSequence);

    method public android.hardware.biometrics.BiometricPrompt.Builder setTitle(@NonNull CharSequence);

  }

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

+4 −3
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
         *

         * @param requireConfirmation

         */

        public Builder setRequireConfirmation(boolean requireConfirmation) {

        @NonNull public Builder setRequireConfirmation(boolean requireConfirmation) {

            mBundle.putBoolean(KEY_REQUIRE_CONFIRMATION, requireConfirmation);

            return this;

        }
@@ -255,7 +255,8 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
         * option to authenticate with their device PIN, pattern, or password. Developers should

         * first check {@link KeyguardManager#isDeviceSecure()} before enabling this. If the device

         * is not secure, {@link BiometricPrompt#BIOMETRIC_ERROR_NO_DEVICE_CREDENTIAL} will be

         * returned in {@link AuthenticationCallback#onAuthenticationError(int, CharSequence)}}

         * returned in {@link AuthenticationCallback#onAuthenticationError(int, CharSequence)}}.

         * Defaults to false.

         *

         * Note that {@link #setNegativeButton(CharSequence, Executor,

         * DialogInterface.OnClickListener)} should not be set if this is set to true.
@@ -264,7 +265,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan 
         *               credentials (PIN, pattern, or password).

         * @return

         */

        public Builder setAllowDeviceCredential(boolean enable) {

        @NonNull public Builder setAllowDeviceCredential(boolean enable) {

            mBundle.putBoolean(KEY_ALLOW_DEVICE_CREDENTIAL, enable);

            return this;

        }