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

Commit ad21c990 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

Change-Id: Ie22caa7c82eeeb364a6b43b38dd87431d1312114
parents 069a85e8 e5506eb0

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 {