diff options
| author | 2017-06-09 21:09:29 +0000 | |
|---|---|---|
| committer | 2017-06-09 21:09:29 +0000 | |
| commit | c24fa30b51362d649c1eced8934f6a73e5182d98 (patch) | |
| tree | a0c0f20b793d2c328105d68e4b5b7c17a2166cc1 | |
| parent | 5d9f5613c35d34923e24439e65a576fef13aada7 (diff) | |
| parent | 0425f9ceea35e7da29f626365679698abdb502de (diff) | |
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4
am: 0425f9ceea
Change-Id: I3f817a83fcbda052ba3ca65fb539a7d77ec8d6a9
| -rw-r--r-- | core/java/android/view/View.java | 4 |
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()) { |