diff options
| author | 2017-06-09 20:59:53 +0000 | |
|---|---|---|
| committer | 2017-06-09 20:59:53 +0000 | |
| commit | 0425f9ceea35e7da29f626365679698abdb502de (patch) | |
| tree | 7421f1c40b7d0977d7049f3712b929d50f4f0f28 | |
| parent | fce339c49cffc947d667bc40659e585b1ce7a68c (diff) | |
| parent | e4835a2af46f1c7fe1ed6a6f985b191395c88d57 (diff) | |
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
am: e4835a2af4
Change-Id: I43a0e7bec7328d7a272c74145817bf4d9a03b69a
| -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 a9c85f0e1488..5c926f61df29 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -8065,6 +8065,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()) { |