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

Merge "Do a null check before returning the primary providers" into udc-dev am: cc87e369b8 am: ec88ba021f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23035616

Change-Id: Icd7be5cab086ba6b2b7a3b3747d583445954e8c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-05 00:25:03 +00:00
committed by Automerger Merge Worker
parent 56b69b14b0 ec88ba021f
commit 0988d20240
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/credentials/java/com/android/server/credentials/CredentialManagerService.java
View File

@@ -290,6 +290,9 @@ public final class CredentialManagerService
mContext, Settings.Secure.CREDENTIAL_SERVICE_PRIMARY, mContext, Settings.Secure.CREDENTIAL_SERVICE_PRIMARY,
/* isMultipleMode= */ true); /* isMultipleMode= */ true);
String[] serviceNames = resolver.readServiceNameList(resolvedUserId); String[] serviceNames = resolver.readServiceNameList(resolvedUserId);
if (serviceNames == null) {
return new HashSet<String>();
}
return new HashSet<String>(Arrays.asList(serviceNames)); return new HashSet<String>(Arrays.asList(serviceNames));
} }