1 files changed, 7 insertions, 5 deletions
diff --git a/input/autofill/AutofillFramework/template-params.xml b/input/autofill/AutofillFramework/template-params.xml
index 5bac84df..e1cc3252 100644
--- a/input/autofill/AutofillFramework/template-params.xml
+++ b/input/autofill/AutofillFramework/template-params.xml
@@ -212,12 +212,14 @@ public void autofill(SparseArray<AutofillValue> values) {
         final int id = values.keyAt(i);
         final AutofillValue value = values.valueAt(i);
         final Item item = mItems.get(id);
-        if (item == null || !item.editable) {
-            // Component either not found or is not editable, so no-op.
-            return;
+        if (item != null && item.editable) {
+            // Set the item's text to the text wrapped in the AutofillValue.
+            item.text = value.getTextValue();
+        } else if (item == null) {
+            // Component not found, so no-op.
+        } else {
+            // Component not editable, so no-op.
         }
-        // Set the item's text to the text wrapped in the AutofillValue.
-        item.text = value.getTextValue();
     }
     postInvalidate();
 }