From 3b548655fd47c57300ccb6b0bee7f12a68ec3a9f Mon Sep 17 00:00:00 2001
From: Sally <sallyyuen@google.com>
Date: Fri, 16 Jul 2021 01:04:18 +0000
Subject: Don't query a null AccessibiiltyNodeInfo when populating
 ViewStructure

Chrome may crash with an NPE

Bug: 193839657
Test: builds
Change-Id: I106bdf80678f9edd6fbd5193d3a79a48c95a1d7a
---
 core/java/android/view/View.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'core/java/android/view/View.java')

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 9450801d8d83..f4223fb467f5 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -10079,9 +10079,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
                 }
                 AccessibilityNodeInfo cinfo = provider.createAccessibilityNodeInfo(
                         AccessibilityNodeInfo.getVirtualDescendantId(info.getChildId(i)));
-                ViewStructure child = structure.newChild(i);
-                populateVirtualStructure(child, provider, cinfo, forAutofill);
-                cinfo.recycle();
+                if (cinfo != null) {
+                    ViewStructure child = structure.newChild(i);
+                    populateVirtualStructure(child, provider, cinfo, forAutofill);
+                    cinfo.recycle();
+                }
             }
         }
     }
-- 
cgit v1.2.3