commit 8d167d55f36004249d36658e082ec4a6a346d91a
author Jerry Shi <sgjerry@google.com> Thu May 04 22:53:36 2023 -0700
committer Guangjie (Jerry) Shi <sgjerry@google.com> Fri May 05 14:59:27 2023 +0000
tree 76cbb574277b2d840d20c8c9188de2d9b42ab605
parent 804214c160a737887e1f5c8e42874d427840fafe

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

Test: local build
Bug: 281047738

Change-Id: I9f3dca118a0d4182e2d727fa011dcb48db2a553f

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

diff --git a/src/com/android/settings/applications/credentials/CombinedProviderInfo.java b/src/com/android/settings/applications/credentials/CombinedProviderInfo.java
index 0446c20..89a13ef 100644
--- a/src/com/android/settings/applications/credentials/CombinedProviderInfo.java
+++ b/src/com/android/settings/applications/credentials/CombinedProviderInfo.java
@@ -51,7 +51,11 @@
             @Nullable AutofillServiceInfo asi,
             boolean isDefaultAutofillProvider,
             boolean IsPrimaryCredmanProvider) {
-        mCredentialProviderInfos = new ArrayList<>(cpis);
+        if (cpis == null) {
+            mCredentialProviderInfos = new ArrayList<>();
+        } else {
+            mCredentialProviderInfos = new ArrayList<>(cpis);
+        }
         mAutofillServiceInfo = asi;
         mIsDefaultAutofillProvider = isDefaultAutofillProvider;
         mIsPrimaryCredmanProvider = IsPrimaryCredmanProvider;
@@ -257,7 +261,7 @@
 
             // 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();
             }