diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-03 19:33:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-03 19:33:27 +0000 |
| commit | 376b23e6fdda35cc6fa61ea9a3c10d109fe2d601 (patch) | |
| tree | 32f74570c8bd757ec3fd99fdb06efae0b25660b3 /keystore/java/android/security/KeyStoreKeyGeneratorSpi.java | |
| parent | e797eb2eea885f086465e47efc464adcd0d7acea (diff) | |
| parent | 08963653fc9434d2f50d3c8e64c757138efd102e (diff) | |
| download | frameworks_base-376b23e6fdda35cc6fa61ea9a3c10d109fe2d601.zip frameworks_base-376b23e6fdda35cc6fa61ea9a3c10d109fe2d601.tar.gz frameworks_base-376b23e6fdda35cc6fa61ea9a3c10d109fe2d601.tar.bz2 | |
am 08963653: Merge "Rename KeymasterException to KeyStoreException."
* commit '08963653fc9434d2f50d3c8e64c757138efd102e':
Rename KeymasterException to KeyStoreException.
Diffstat (limited to 'keystore/java/android/security/KeyStoreKeyGeneratorSpi.java')
| -rw-r--r-- | keystore/java/android/security/KeyStoreKeyGeneratorSpi.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyStoreKeyGeneratorSpi.java b/keystore/java/android/security/KeyStoreKeyGeneratorSpi.java index 69533b4..c9c9bd8 100644 --- a/keystore/java/android/security/KeyStoreKeyGeneratorSpi.java +++ b/keystore/java/android/security/KeyStoreKeyGeneratorSpi.java @@ -173,7 +173,7 @@ public abstract class KeyStoreKeyGeneratorSpi extends KeyGeneratorSpi { int errorCode = mKeyStore.generateKey( keyAliasInKeystore, args, additionalEntropy, flags, new KeyCharacteristics()); if (errorCode != KeyStore.NO_ERROR) { - throw KeymasterUtils.getCryptoOperationException(errorCode); + throw KeyStore.getCryptoOperationException(errorCode); } String keyAlgorithmJCA = KeyStoreKeyConstraints.Algorithm.toJCASecretKeyAlgorithm(mAlgorithm, mDigest); |