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

Commit 3a435f03 authored by Robin Lee's avatar Robin Lee
Browse files

Return null on getPrivateKey failure not exception 

According to documentation:

Returns the {@code PrivateKey} for the requested alias, or null if
there is no result.

@throws KeyChainException if the alias was valid but there was some
problem accessing it.

@throws IllegalStateException if called from the main thread.

In this case the alias doesn't exist or isn't visible to the caller so
they should get null back instead of KeyChainException.

Change-Id: Ied5603ac6aefbcef79050f24c2aa7ee8f386be0b
parent 02668807

keystore/java/android/security/KeyChain.java

+2 −2
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ public final class KeyChain { 


    /**

     * Returns the {@code PrivateKey} for the requested alias, or null

     * if no there is no result.

     * if there is no result.

     *

     * <p> This method may block while waiting for a connection to another process, and must never

     * be called from the main thread.
@@ -371,7 +371,7 @@ public final class KeyChain { 
            final IKeyChainService keyChainService = keyChainConnection.getService();

            final String keyId = keyChainService.requestPrivateKey(alias);

            if (keyId == null) {

                throw new KeyChainException("keystore had a problem");

                return null;

            }

            return AndroidKeyStoreProvider.loadAndroidKeyStorePrivateKeyFromKeystore(

                    KeyStore.getInstance(), keyId, KeyStore.UID_SELF);