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

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

Merge "Do null check to account for the case where provider is only autofill... 

Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b5 am: 5ea3d205

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



Change-Id: Ida6d4cc55ec83fe30a75fb577170f47b60bd0eb2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3a164bc0 5ea3d205

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

+6 −2
Original line number Diff line number Diff line
@@ -51,7 +51,11 @@ public final class CombinedProviderInfo { 
            @Nullable AutofillServiceInfo asi,

            boolean isDefaultAutofillProvider,

            boolean IsPrimaryCredmanProvider) {

        if (cpis == null) {

            mCredentialProviderInfos = new ArrayList<>();

        } else {

            mCredentialProviderInfos = new ArrayList<>(cpis);

        }

        mAutofillServiceInfo = asi;

        mIsDefaultAutofillProvider = isDefaultAutofillProvider;

        mIsPrimaryCredmanProvider = IsPrimaryCredmanProvider;
@@ -257,7 +261,7 @@ public final class CombinedProviderInfo { 


            // Check if we have any enabled cred man services.

            boolean isPrimaryCredmanProvider = false;

            if (!cpi.isEmpty()) {

            if (cpi != null && !cpi.isEmpty()) {

                isPrimaryCredmanProvider = cpi.get(0).isPrimary();

            }