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

Commit c6a74847 authored by Becca Hughes's avatar Becca Hughes Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d544 

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



Change-Id: I79a8f47acb16ac995333c7c40a0309c83e67404c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1ad544c 99f1d544

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

+21 −0
Original line number Diff line number Diff line
@@ -376,6 +376,10 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl 
        Map<String, List<CredentialProviderInfo>> groupedInfos = new HashMap<>();

        for (CredentialProviderInfo cpi : mServices) {

            String packageName = cpi.getServiceInfo().packageName;

            if (isProviderHiddenBecauseOfAutofill(packageName)) {

                continue;

            }



            if (!groupedInfos.containsKey(packageName)) {

                groupedInfos.put(packageName, new ArrayList<>());

            }
@@ -579,6 +583,23 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl 
        return new NewProviderConfirmationDialogFragment(host, packageName, appName);

    }



    /** If the provider is also the autofill provider then hide it. */

    @VisibleForTesting

    public boolean isProviderHiddenBecauseOfAutofill(String packageName) {

        final String autofillService = Settings.Secure.getStringForUser(

                mContext.getContentResolver(),

                Settings.Secure.AUTOFILL_SERVICE,

                getUser());

        if (autofillService == null || TextUtils.isEmpty(autofillService)) {

            return false;

        }

        if (packageName == null || TextUtils.isEmpty(packageName)) {

            return false;

        }



        return autofillService.startsWith(packageName);

    }



    @VisibleForTesting

    void completeEnableProviderDialogBox(

            int whichButton, String packageName, boolean setActivityResult) {

tests/unit/src/com/android/settings/applications/credentials/CredentialManagerPreferenceControllerTest.java

+19 −0
Original line number Diff line number Diff line
@@ -122,6 +122,25 @@ public class CredentialManagerPreferenceControllerTest { 
        assertThat(controller.getAvailabilityStatus()).isEqualTo(AVAILABLE);

    }



    @Test

    public void verifyHiddenIfAutofillSelectedProvider() {

        CredentialManagerPreferenceController controller =

                createControllerWithServices(Collections.emptyList());



        // Set the autofill provider.

        Settings.Secure.putStringForUser(mContext.getContentResolver(),

                Settings.Secure.AUTOFILL_SERVICE, "com.example.test/AutofillClass",

                UserHandle.myUserId());



        // Verify the error cases

        assertThat(controller.isProviderHiddenBecauseOfAutofill(null)).isFalse();

        assertThat(controller.isProviderHiddenBecauseOfAutofill("")).isFalse();

        assertThat(controller.isProviderHiddenBecauseOfAutofill("test")).isFalse();



        // Verify the example.

        assertThat(controller.isProviderHiddenBecauseOfAutofill("com.example.test")).isTrue();

    }



    @Test

    public void displayPreference_noServices_noPreferencesAdded_useAutofillUri() {

        Settings.Secure.putStringForUser(