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

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

Change-Id: If9079b606b579ec82b4803adf6abfdf205599eeb
parents 94754ea0 a970f218

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 {