summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <android-build-merger@google.com> 2017-06-09 21:10:19 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-06-09 21:10:24 +0000
commit18de66783ab62ae6a09e87522422ac6131c0868d (patch)
treea0c0f20b793d2c328105d68e4b5b7c17a2166cc1
parent385f581ffd97337e1aac8f2e1881e6ff454cfba5 (diff)
parentc24fa30b51362d649c1eced8934f6a73e5182d98 (diff)
Merge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4 am: 0425f9ceea" into oc-dr1-dev-plus-aosp
-rw-r--r--core/java/android/view/View.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 44f70000d590..83f1ed93d026 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8063,6 +8063,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
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()) {