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

Commit 74245220 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make IdentityCredentialStore.getInstance() return null if credstore is... 

Merge "Make IdentityCredentialStore.getInstance() return null if credstore is not installed." am: a970f218 am: e5506eb0 am: ad21c990

Change-Id: I2ef0bb817a190df4eb48b77020211954750aed66
parents 37fe5fa7 ad21c990

identity/java/android/security/identity/CredstoreIdentityCredentialStore.java

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ class CredstoreIdentityCredentialStore extends IdentityCredentialStore { 
        ICredentialStoreFactory storeFactory =

                ICredentialStoreFactory.Stub.asInterface(

                    ServiceManager.getService("android.security.identity"));

        if (storeFactory == null) {

            // This can happen if credstore is not running or not installed.

            return null;

        }



        ICredentialStore credStore = null;

        try {