Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index a9c85f0..5c926f6 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8065,6 +8065,10 @@
             boolean forAutofill, @AutofillFlags int flags) {
         if (forAutofill) {
             structure.setAutofillId(getAutofillId());
+            if (!isLaidOut()) {
+                Log.w(VIEW_LOG_TAG, "dispatchProvideAutofillStructure(): not laid out, ignoring");
+                return;
+            }
             onProvideAutofillStructure(structure, flags);
             onProvideAutofillVirtualStructure(structure, flags);
         } else if (!isAssistBlocked()) {