Merge "Make IdentityCredentialStore.getInstance() return null if credstore is not installed." am: a970f218ea am: e5506eb032

Change-Id: Ie22caa7c82eeeb364a6b43b38dd87431d1312114
2020-02-05 17:00:51 +00:00
parent 069a85e865 e5506eb032
commit ad21c990e4
1 changed files with 4 additions and 0 deletions
--- a/identity/java/android/security/identity/CredstoreIdentityCredentialStore.java
+++ b/identity/java/android/security/identity/CredstoreIdentityCredentialStore.java
@@ -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 {