summaryrefslogtreecommitdiff
path: root/core/java/android/view/View.java
diff options
context:
space:
mode:
authorSally <sallyyuen@google.com>2021-07-16 01:04:18 +0000
committerSally <sallyyuen@google.com>2021-07-16 01:07:13 +0000
commit3b548655fd47c57300ccb6b0bee7f12a68ec3a9f (patch)
treeb92dc7e9ab450aef2cca8f153270923d9c18cd7a /core/java/android/view/View.java
parent9c8441c8af30f9e85d833d7bd8cf0aa74599b7fb (diff)
Don't query a null AccessibiiltyNodeInfo when populating ViewStructure
Chrome may crash with an NPE Bug: 193839657 Test: builds Change-Id: I106bdf80678f9edd6fbd5193d3a79a48c95a1d7a
Diffstat (limited to 'core/java/android/view/View.java')
-rw-r--r--core/java/android/view/View.java8
1 files changed, 5 insertions, 3 deletions
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();
+ }
}
}
}