Merge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4 am: 0425f9ceea" into oc-dr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2017-06-09 21:10:19 +00:00
committed by Android (Google) Code Review

View File

@@ -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()) {