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

Commit 0f06cd0c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Update ACTION_BIOMETRIC_ENROLL documentation" into rvc-dev am:... 

Merge "Update ACTION_BIOMETRIC_ENROLL documentation" into rvc-dev am: 5a563d28 am: 8b37efea am: 5ce73638

Change-Id: I863b1e169cd3916795f749a9e26f2a6803b7a2a3
parents 4b35e0f3 5ce73638

core/java/android/provider/Settings.java

+1 −4
Original line number Original line Diff line number Diff line
@@ -710,10 +710,7 @@ public final class Settings { 
     * If not specified, the default behavior is

     * If not specified, the default behavior is

     * {@link android.hardware.biometrics.BiometricManager.Authenticators#BIOMETRIC_WEAK}.

     * {@link android.hardware.biometrics.BiometricManager.Authenticators#BIOMETRIC_WEAK}.

     * <p>

     * <p>

     * Output: Returns {@link android.app.Activity#RESULT_CANCELED} if the user already has an

     * Output: Nothing. Note that callers should still check

     * authenticator that meets the requirements, or if the device cannot fulfill the request

     * (e.g. does not have biometric hardware). Returns {@link android.app.Activity#RESULT_OK}

     * otherwise. Note that callers should still check

     * {@link android.hardware.biometrics.BiometricManager#canAuthenticate(int)}

     * {@link android.hardware.biometrics.BiometricManager#canAuthenticate(int)}

     * afterwards to ensure that the user actually completed enrollment.

     * afterwards to ensure that the user actually completed enrollment.

     */

     */