From 6219f2693e7ce2fc504370417bfbeea324da4387 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Thu, 6 Apr 2017 09:39:01 -0700
Subject: [PATCH] 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
---
 core/java/android/view/View.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index a376c83ac17cd..b4100123a5b87 100644
--- 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();
         }