Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3e24a05 authored by Guangjie (Jerry) Shi's avatar Guangjie (Jerry) Shi Committed by Automerger Merge Worker
Browse files

Merge "Modify the usage of setEnabledProvider to temporarily passed in empty... 

Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee848

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498



Change-Id: Ie4d4a6cdc9e94ce2143255e7f380ff7492abe825
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b0df2203 817ee848

src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java

+1 −0
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl 


        List<String> enabledServices = getEnabledSettings();

        mCredentialManager.setEnabledProviders(

                new ArrayList<String>(), // TODO(240466271): pass down primary providers

                enabledServices,

                getUser(),

                mExecutor,

src/com/android/settings/applications/credentials/DefaultCombinedPicker.java

+1 −0
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ public class DefaultCombinedPicker extends DefaultAppPickerFragment { 
        }



        service.setEnabledProviders(

                new ArrayList<String>(), // TODO(240466271): pass down primary providers.

                credManProviders,

                mUserId,

                ContextCompat.getMainExecutor(getContext()),