| commit | e7fe59a09b5f02536a7e51fe713c41efa1d0b4d8 | [log] [tgz] |
|---|---|---|
| author | Becca Hughes <beccahughes@google.com> | Tue May 09 01:31:14 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 09 01:31:14 2023 +0000 |
| tree | b5fa5c46a1f031c5946d5901f0f68cf3b44d761c | |
| parent | 65a9252d213af81311d10d49dac695da179d7c80 [diff] | |
| parent | 11436efb901f2500900171e3811b6ce69049b64f [diff] |
Merge "Disable all providers if none selected" into udc-dev am: 762691c365 am: 9230389dcd am: 11436efb90 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870 Change-Id: Idc6aa7970cc26df83d7226b185afece1bf475b0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java index 634be4c..5381056 100644 --- a/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java +++ b/src/com/android/settings/applications/credentials/DefaultCombinedPicker.java
@@ -371,6 +371,11 @@ 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,