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

Commit 761be859 authored by Pavel Grafov's avatar Pavel Grafov Committed by Automerger Merge Worker
Browse files

Merge "Make getKeyStoreForUid convert uid to namespace." am: fd1b9aa4 am:... 

Merge "Make getKeyStoreForUid convert uid to namespace." am: fd1b9aa4 am: 23db5bf1 am: 89f6fa14

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573441

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I227302bf5a7d809b8ed68987bd7830220cb862e7
parents e4c25a7a 89f6fa14

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

+7 −5
Original line number Diff line number Diff line
@@ -434,14 +434,16 @@ public class AndroidKeyStoreProvider extends Provider { 
    @NonNull

    public static java.security.KeyStore getKeyStoreForUid(int uid)

            throws KeyStoreException, NoSuchProviderException {

        String providerName = PROVIDER_NAME;

        final java.security.KeyStore.LoadStoreParameter loadParameter;

        if (android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) {

            providerName = "AndroidKeyStoreLegacy";

            loadParameter = new android.security.keystore2.AndroidKeyStoreLoadStoreParameter(

                    KeyProperties.legacyUidToNamespace(uid));

        } else {

            loadParameter = new AndroidKeyStoreLoadStoreParameter(uid);

        }

        java.security.KeyStore result =

                java.security.KeyStore.getInstance(providerName);

        java.security.KeyStore result = java.security.KeyStore.getInstance(PROVIDER_NAME);

        try {

            result.load(new AndroidKeyStoreLoadStoreParameter(uid));

            result.load(loadParameter);

        } catch (NoSuchAlgorithmException | CertificateException | IOException e) {

            throw new KeyStoreException(

                    "Failed to load AndroidKeyStore KeyStore for UID " + uid, e);