commit eefb3c91f126e8d26fd56b338ee593c5a2b381f3
author Felipe Leme <felipeal@google.com> Thu Apr 06 20:04:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 06 20:04:53 2017 +0000
tree b6c55a2de9cd004e8e8072b400e676a18db773a9
parent b99d392425676d2e719f1485e2b4d045427d96d0
parent 75d0d92f7b78013a04e4d796c3da1a0dfeb198e1

Merge "Fixed Autofill NPE that crashed some apps." into oc-dev
am: 75d0d92f7b

Change-Id: I0a0b70b0a6e476b038af6e58fa524eadd3856de2

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index a376c83..b4100123 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7431,6 +7431,9 @@
             AccessibilityNodeInfo info = createAccessibilityNodeInfo();
             structure.setChildCount(1);
             ViewStructure root = structure.newChild(0);
+            if (forAutofill) {
+                setAutofillId(root);
+            }
             populateVirtualStructure(root, provider, info, forAutofill);
             info.recycle();
         }