1 files changed, 4 insertions, 1 deletions
diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/model/ClientFormData.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/model/ClientFormData.java
index aa57e935..3658519e 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/model/ClientFormData.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofillframework/service/model/ClientFormData.java
@@ -112,10 +112,13 @@ public final class ClientFormData {
                 continue;
             }
             for (int autofillFieldIndex = 0; autofillFieldIndex < autofillFields.size(); autofillFieldIndex++) {
+                SavedAutofillValue savedAutofillValue = hintMap.get(hint);
+                if (savedAutofillValue == null) {
+                    continue;
+                }
                 AutofillField autofillField = autofillFields.get(autofillFieldIndex);
                 AutofillId autofillId = autofillField.getId();
                 int autofillType = autofillField.getAutofillType();
-                SavedAutofillValue savedAutofillValue = hintMap.get(hint);
                 switch (autofillType) {
                     case View.AUTOFILL_TYPE_LIST:
                         int listValue = autofillField.getAutofillOptionIndex(savedAutofillValue.getTextValue());