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

Commit 4fe1f506 authored by Becca Hughes's avatar Becca Hughes
Browse files

Set primary services as enabled 

Test: make
Bug: 281121157
Change-Id: Ide7902d0561fa6e513e90f8245da6a754c856ae7
parent 17a0266b

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

+5 −2
Original line number Diff line number Diff line
@@ -564,15 +564,18 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl 
        // Get the existing primary providers since we don't touch them in

        // this part of the UI we should just copy them over.

        Set<String> primaryServices = new HashSet<>();

        List<String> enabledServices = getEnabledSettings();

        for (CredentialProviderInfo service : mServices) {

            if (service.isPrimary()) {

                primaryServices.add(service.getServiceInfo().getComponentName().flattenToString());

                String flattened = service.getServiceInfo().getComponentName().flattenToString();

                primaryServices.add(flattened);

                enabledServices.add(flattened);

            }

        }



        mCredentialManager.setEnabledProviders(

                new ArrayList<>(primaryServices),

                getEnabledSettings(),

                enabledServices,

                getUser(),

                mExecutor,

                new OutcomeReceiver<Void, SetEnabledProvidersException>() {

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

+2 −0
Original line number Diff line number Diff line
@@ -369,6 +369,8 @@ public class DefaultCombinedPicker extends DefaultAppPickerFragment { 
            }

        }



        credManProviders.addAll(primaryCredManProviders);



        service.setEnabledProviders(

                primaryCredManProviders,

                credManProviders,