Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ie22caa7c82eeeb364a6b43b38dd87431d1312114
This commit is contained in:
Automerger Merge Worker
2020-02-05 17:00:51 +00:00
parent 069a85e865 e5506eb032
commit ad21c990e4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
identity/java/android/security/identity/CredstoreIdentityCredentialStore.java
View File

@@ -38,6 +38,10 @@ class CredstoreIdentityCredentialStore extends IdentityCredentialStore {
ICredentialStoreFactory storeFactory = ICredentialStoreFactory storeFactory =
ICredentialStoreFactory.Stub.asInterface( ICredentialStoreFactory.Stub.asInterface(
ServiceManager.getService("android.security.identity")); ServiceManager.getService("android.security.identity"));
if (storeFactory == null) {
// This can happen if credstore is not running or not installed.
return null;
}
ICredentialStore credStore = null; ICredentialStore credStore = null;
try { try {