Merge "Fixed Autofill NPE that crashed some apps." into oc-dev

am: 75d0d92f7b Change-Id: I0a0b70b0a6e476b038af6e58fa524eadd3856de2
2017-04-06 20:04:53 +00:00
parent b99d392425 75d0d92f7b
commit eefb3c91f1
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7431,6 +7431,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
            AccessibilityNodeInfo info = createAccessibilityNodeInfo();
            structure.setChildCount(1);
            ViewStructure root = structure.newChild(0);
+            if (forAutofill) {
+                setAutofillId(root);
+            }
            populateVirtualStructure(root, provider, info, forAutofill);
            info.recycle();
        }