commit 587389fe2ec1cfe058016b11b1103715a9d33556
author Felipe Leme <felipeal@google.com> Thu Apr 06 09:39:01 2017 -0700
committer gitbuildkicker <android-build@google.com> Thu Apr 06 13:40:35 2017 -0700
tree a590f37f5cce36e21602070fb17b87f410aa5100
parent 471c652bb260db2a4a848ed2cba6fc4e43d4edc8

Fixed Autofill NPE that crashed some apps.

It happened when views provided an Accessibility node that had children.

Bug: 37078783
Fixes: 37009008
Test: LoginActivityTest#testAutoFillWhenViewHasChildAccessibilityNodes

Change-Id: Ie694094afe9129b933096a385eb867baf4550e7f
(cherry picked from commit 6219f2693e7ce2fc504370417bfbeea324da4387)

core/java/android/view/View.java

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