commit 4beff1fc13762bed8181ed967b2dfee83da04c47
author Erik Wolsheimer <ewol@google.com> Tue Jul 19 17:57:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 19 17:57:06 2016 +0000
tree cf1c9ed835147cf0dae25d5b07473d113aadc824
parent 53fb2a4a3858de33c97cac0bae137689a38af781
parent 45b8216d33d6f9edff405b69b7787c29cca3ec9b

Merge \"Fix a broken case of AndroidKeyStoreProvider error logging\" into nyc-mr1-dev
am: 45b8216d33

Change-Id: I774014fc4922f10a5fd0b23239b0a5710a4f3f3c

keystore/java/android/security/keystore/AndroidKeyStoreProvider.java

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;