From bcd608643c5267b33d1311b0e978266a93908614 Mon Sep 17 00:00:00 2001
From: Jerry Shi <sgjerry@google.com>
Date: Thu, 4 May 2023 10:53:16 -0700
Subject: [PATCH] Do a null check before returning the primary providers

Test: local build
Bug: 280492574

Change-Id: I0182c2060fbe5c74027785d539671f9eaaaf2a25
---
 .../android/server/credentials/CredentialManagerService.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/credentials/java/com/android/server/credentials/CredentialManagerService.java b/services/credentials/java/com/android/server/credentials/CredentialManagerService.java
index 08d7d5b872ac0..d90cb36fcd04d 100644
--- a/services/credentials/java/com/android/server/credentials/CredentialManagerService.java
+++ b/services/credentials/java/com/android/server/credentials/CredentialManagerService.java
@@ -290,6 +290,9 @@ public final class CredentialManagerService
                 mContext, Settings.Secure.CREDENTIAL_SERVICE_PRIMARY,
                 /* isMultipleMode= */ true);
         String[] serviceNames = resolver.readServiceNameList(resolvedUserId);
+        if (serviceNames == null) {
+            return new HashSet<String>();
+        }
         return new HashSet<String>(Arrays.asList(serviceNames));
     }