am 31ed2044: Merge "Add documentation for possible AndroidKeyStore exceptions to authenticate() call" into mnc-dev

* commit '31ed2044e2907954b32148c06b131d3069b1c8ca':
  Add documentation for possible AndroidKeyStore exceptions to authenticate() call
This commit is contained in:
Jim Miller
2015-06-09 22:39:22 +00:00
committed by Android Git Automerger

View File

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