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

Commit 25ddd06d authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Fix createConfirmDeviceCredentialIntent documentation" into qt-dev 

am: 4ae98164

Change-Id: I9ddeb39ecd7ff5222e6f121147a1b2504d2ba45b
parents 1812af1f 4ae98164

core/java/android/app/KeyguardManager.java

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



    /**

     * @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

     * activity using {@link android.app.Activity#startActivityForResult(Intent, int)} and check for

     * {@link android.app.Activity#RESULT_OK} if the user successfully completes the challenge.

     *

     * @return the intent for launching the activity or null if no password is required.

     **/

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

     */

    @Deprecated

    @RequiresFeature(PackageManager.FEATURE_SECURE_LOCK_SCREEN)

    public Intent createConfirmDeviceCredentialIntent(CharSequence title,