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

Commit 2898e3b5 authored by Guangjie (Jerry) Shi's avatar Guangjie (Jerry) Shi Committed by Android (Google) Code Review
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
parents 5b18837a 8d167d55

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();

            }