summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-06-09 13:48:57 -0700
committerJim Miller <jaggies@google.com>2015-06-09 15:26:43 -0700
commite4c58e46419bdc1cbe94516bdded71f017534d9c (patch)
treeb7488d2a04c7951aa040830f0848f8eb01b23496 /core/java/android
parent800ebfc166a96e4125029cd994011ada750e56de (diff)
Add documentation for possible AndroidKeyStore exceptions to authenticate() call
Fixes bug 20864436 Change-Id: Ic3f7406a8a6f41283ccd63018787a20353510024
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/hardware/fingerprint/FingerprintManager.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index e61813cc2c94..82d3e0ac50bd 100644
--- a/core/java/android/hardware/fingerprint/FingerprintManager.java
+++ b/core/java/android/hardware/fingerprint/FingerprintManager.java
@@ -396,6 +396,11 @@ public class FingerprintManager {
* @param flags optional flags; should be 0
* @param callback an object to receive authentication events
* @param handler an optional handler to handle callback events
+ *
+ * @throws IllegalArgumentException if the crypto operation is not supported or is not backed
+ * by <a href="{@docRoot}training/articles/keystore.html">Android Keystore
+ * facility</a>.
+ * @throws IllegalStateException if the crypto primitive is not initialized.
*/
@RequiresPermission(USE_FINGERPRINT)
public void authenticate(@Nullable CryptoObject crypto, @Nullable CancellationSignal cancel,