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

am: 45b8216d33 Change-Id: I774014fc4922f10a5fd0b23239b0a5710a4f3f3c
2016-07-19 17:57:06 +00:00
parent 53fb2a4a38 45b8216d33
commit 4beff1fc13
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;