From e0daeb4c2bcd1a4eb0a955983900d14801819f37 Mon Sep 17 00:00:00 2001
From: Jerry Shi <sgjerry@google.com>
Date: Fri, 5 May 2023 15:15:22 -0700
Subject: [PATCH] Ensure primary provider is contained in the list of enabled
 providers

Test: build local
Bug: 281121157

Change-Id: I3d9f8a57ab4fc89bbc91c43d050fc0d05ee998e7
---
 .../server/credentials/CredentialManagerService.java        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/credentials/java/com/android/server/credentials/CredentialManagerService.java b/services/credentials/java/com/android/server/credentials/CredentialManagerService.java
index 57b3c0d431a22..86dbe11d5ddce 100644
--- a/services/credentials/java/com/android/server/credentials/CredentialManagerService.java
+++ b/services/credentials/java/com/android/server/credentials/CredentialManagerService.java
@@ -25,7 +25,6 @@ import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.UserIdInt;
 import android.app.ActivityManager;
-import android.provider.Settings;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageInfo;
@@ -727,10 +726,13 @@ public final class CredentialManagerService
                             "setEnabledProviders",
                             null);
 
+            Set<String> enableProvider = new HashSet<>(providers);
+            enableProvider.addAll(primaryProviders);
+
             boolean writeEnabledStatus =
                     Settings.Secure.putStringForUser(getContext().getContentResolver(),
                             Settings.Secure.CREDENTIAL_SERVICE,
-                            String.join(":", providers),
+                            String.join(":", enableProvider),
                             userId);
 
             boolean writePrimaryStatus =