Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update ACTION_BIOMETRIC_ENROLL documentation" into rvc-dev am: 5a563d2870 am: 8b37efeae4 am: 5ce7363820

Browse Source 
Change-Id: I863b1e169cd3916795f749a9e26f2a6803b7a2a3
This commit is contained in:
Automerger Merge Worker
2020-03-11 21:29:32 +00:00
parent 4b35e0f3b3 5ce7363820
commit 0f06cd0ca3
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/provider/Settings.java
View File

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