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

am: 4beff1fc13 Change-Id: I0e547655e9a10572be341db50976c66ae493d021
2016-07-19 18:01:29 +00:00
parent f7de5eeeac 4beff1fc13
commit cde8c47be6
1 changed files with 1 additions and 1 deletions
--- a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
+++ b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
@@ -228,7 +228,7 @@ public class AndroidKeyStoreProvider extends Provider {
        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;