From c8e557470fc94733c9340c4c67ee69c225bbaa70 Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Tue, 31 Mar 2015 19:50:13 -0700 Subject: Hook in user authenticators and their exceptions. Bug: 18088752 Change-Id: I2835dbe51d09587a3081597c6aaf536aa1427e24 --- keystore/java/android/security/KeyStoreCipherSpi.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'keystore/java/android/security/KeyStoreCipherSpi.java') diff --git a/keystore/java/android/security/KeyStoreCipherSpi.java b/keystore/java/android/security/KeyStoreCipherSpi.java index 87f0d8e..f3089c6 100644 --- a/keystore/java/android/security/KeyStoreCipherSpi.java +++ b/keystore/java/android/security/KeyStoreCipherSpi.java @@ -222,8 +222,7 @@ public abstract class KeyStoreCipherSpi extends CipherSpi { if (opResult == null) { throw new KeyStoreConnectException(); } else if (opResult.resultCode != KeyStore.NO_ERROR) { - throw new CryptoOperationException("Failed to start keystore operation", - KeymasterUtils.getExceptionForKeymasterError(opResult.resultCode)); + throw KeymasterUtils.getCryptoOperationException(opResult.resultCode); } if (opResult.token == null) { @@ -249,7 +248,7 @@ public abstract class KeyStoreCipherSpi extends CipherSpi { try { output = mMainDataStreamer.update(input, inputOffset, inputLen); } catch (KeymasterException e) { - throw new CryptoOperationException("Keystore operation failed", e); + throw KeymasterUtils.getCryptoOperationException(e); } if (output.length == 0) { @@ -294,7 +293,7 @@ public abstract class KeyStoreCipherSpi extends CipherSpi { case KeymasterDefs.KM_ERROR_VERIFICATION_FAILED: throw new AEADBadTagException(); default: - throw new CryptoOperationException("Keystore operation failed", e); + throw KeymasterUtils.getCryptoOperationException(e); } } -- cgit v1.1