From 9e5b34ceb0c1bdab1234dc785368c43f2fa25ed7 Mon Sep 17 00:00:00 2001 From: Becca Hughes Date: Mon, 8 May 2023 23:42:47 +0000 Subject: [PATCH] Disable provider if removed from primary Test: make Bug: 281109887 Change-Id: Ie301cfc57176c6563b4be5cc661514a4324477c9 --- .../applications/credentials/DefaultCombinedPicker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java index 634be4c09e8..06adeb8d615 100644 --- a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java +++ b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java @@ -364,7 +364,7 @@ public class DefaultCombinedPicker extends DefaultAppPickerFragment { service.getCredentialProviderServices( mUserId, CredentialManager.PROVIDER_FILTER_USER_PROVIDERS_ONLY)) { - if (cpi.isEnabled()) { + if (cpi.isEnabled() && !cpi.isPrimary()) { credManProviders.add(cpi.getServiceInfo().getComponentName().flattenToString()); } }