Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4beff1fc authored by Erik Wolsheimer's avatar Erik Wolsheimer Committed by android-build-merger
Browse files

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

am: 45b8216d

Change-Id: I774014fc4922f10a5fd0b23239b0a5710a4f3f3c
parents 53fb2a4a 45b8216d

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

+1 −1
Original line number Diff line number Diff line
@@ -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;