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

Commit 45b8216d authored by ewol's avatar ewol Committed by Android (Google) Code Review
Browse files

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

parents 47f73c47 292d291f

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -228,7 +228,7 @@ public class AndroidKeyStoreProvider extends Provider { 
        if (exportResult.resultCode != KeyStore.NO_ERROR) {

        if (exportResult.resultCode != KeyStore.NO_ERROR) {

            throw (UnrecoverableKeyException)

            throw (UnrecoverableKeyException)

                    new UnrecoverableKeyException("Failed to obtain X.509 form of public key")

                    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;

        final byte[] x509EncodedPublicKey = exportResult.exportData;