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

Commit 38a3645a 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: I3beee0f10d1f007b8df76f3871a01bae7121d013
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf18fba8 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()),