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

Commit 14efad99 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set primary services as enabled" into udc-dev am: 1dc52d15 am: b4929148 

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



Change-Id: Ie1f2311d208380d807a52411fcd398d77b61aae2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d4c33e36 b4929148

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

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

        // Get the existing primary providers since we don't touch them in

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

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

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

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

        List<String> enabledServices = getEnabledSettings();

        for (CredentialProviderInfo service : mServices) {

        for (CredentialProviderInfo service : mServices) {

            if (service.isPrimary()) {

            if (service.isPrimary()) {

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

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

                primaryServices.add(flattened);

                enabledServices.add(flattened);

            }

            }

        }

        }





        mCredentialManager.setEnabledProviders(

        mCredentialManager.setEnabledProviders(

                new ArrayList<>(primaryServices),

                new ArrayList<>(primaryServices),

                getEnabledSettings(),

                enabledServices,

                getUser(),

                getUser(),

                mExecutor,

                mExecutor,

                new OutcomeReceiver<Void, SetEnabledProvidersException>() {

                new OutcomeReceiver<Void, SetEnabledProvidersException>() {

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

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

            }

        }

        }





        credManProviders.addAll(primaryCredManProviders);



        service.setEnabledProviders(

        service.setEnabledProviders(

                primaryCredManProviders,

                primaryCredManProviders,

                credManProviders,

                credManProviders,