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

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

Merge "Update BiometricPrompt API naming"

parents a3882ad8 e64d74ec

api/current.txt

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

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

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

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

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

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

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

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

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

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

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

  }

core/java/android/app/KeyguardManager.java

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class KeyguardManager { 
    public static final int RESULT_ALTERNATE = 1;



    /**

     * @deprecated see {@link BiometricPrompt.Builder#setAllowDeviceCredential(boolean)}

     * @deprecated see {@link BiometricPrompt.Builder#setDeviceCredentialAllowed(boolean)}

     *

     * Get an intent to prompt the user to confirm credentials (pin, pattern, password or biometrics

     * if enrolled) for the current user of the device. The caller is expected to launch this

core/java/android/hardware/biometrics/BiometricConstants.java

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ public interface BiometricConstants { 


    /**

     * The device does not have pin, pattern, or password set up. See

     * {@link BiometricPrompt.Builder#setAllowDeviceCredential(boolean)} and

     * {@link BiometricPrompt.Builder#setDeviceCredentialAllowed(boolean)} and

     * {@link KeyguardManager#isDeviceSecure()}

     */

    int BIOMETRIC_ERROR_NO_DEVICE_CREDENTIAL = 14;

core/java/android/hardware/biometrics/BiometricFaceConstants.java

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public interface BiometricFaceConstants { 


    /**

     * The device does not have pin, pattern, or password set up. See

     * {@link BiometricPrompt.Builder#setAllowDeviceCredential(boolean)} and

     * {@link BiometricPrompt.Builder#setDeviceCredentialAllowed(boolean)} and

     * {@link KeyguardManager#isDeviceSecure()}

     */

    public static final int BIOMETRIC_ERROR_NO_DEVICE_CREDENTIAL = 14;

core/java/android/hardware/biometrics/BiometricFingerprintConstants.java

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public interface BiometricFingerprintConstants { 


    /**

     * The device does not have pin, pattern, or password set up. See

     * {@link BiometricPrompt.Builder#setAllowDeviceCredential(boolean)} and

     * {@link BiometricPrompt.Builder#setDeviceCredentialAllowed(boolean)} and

     * {@link KeyguardManager#isDeviceSecure()}

     * @hide

     */