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

2017-04-06 19:36:16 +00:00
parent eb93670383 6219f2693e
commit 75d0d92f7b
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();
        }