commit | cde8c47be613ce78b2282afbc3e94da418072447 | [log] [tgz] |
---|---|---|
author | ewol <ewol@google.com> | Tue Jul 19 18:01:29 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 19 18:01:29 2016 +0000 |
tree | d58ec43c5bd54b6bf0b2ca14a71c7e800f58d687 | |
parent | f7de5eeeac88441df5782736fafe0a4c6c063e7f [diff] | |
parent | 4beff1fc13762bed8181ed967b2dfee83da04c47 [diff] |
Merge \\"Fix a broken case of AndroidKeyStoreProvider error logging\\" into nyc-mr1-dev am: 45b8216d33 am: 4beff1fc13 Change-Id: I0e547655e9a10572be341db50976c66ae493d021
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java index 8c20ddc..f36c00c 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
@@ -228,7 +228,7 @@ if (exportResult.resultCode != KeyStore.NO_ERROR) { throw (UnrecoverableKeyException) new UnrecoverableKeyException("Failed to obtain X.509 form of public key") - .initCause(KeyStore.getKeyStoreException(errorCode)); + .initCause(KeyStore.getKeyStoreException(exportResult.resultCode)); } final byte[] x509EncodedPublicKey = exportResult.exportData;