Merge "Disable all providers if none selected" into udc-dev

2023-05-08 20:58:01 +00:00
parent 2971c13923 5262570691
commit 762691c365
1 changed files with 5 additions and 0 deletions
--- a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
+++ b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
@@ -371,6 +371,11 @@ public class DefaultCombinedPicker extends DefaultAppPickerFragment {

        credManProviders.addAll(primaryCredManProviders);

+        // If there is no provider then clear all the providers.
+        if (TextUtils.isEmpty(autofillProvider) && primaryCredManProviders.isEmpty()) {
+            credManProviders.clear();
+        }
+
        service.setEnabledProviders(
                primaryCredManProviders,
                credManProviders,