commit 27c5bed4fa582fa934da55528c12af414167de8d
author Daniel Norman <danielnorman@google.com> Fri Jun 02 21:25:54 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 02 21:25:54 2023 +0000
tree 246bbb0d75c449149b96c38171ad540ed4d4bac0
parent 106176e31736483c3167547b9f91b427d980450a
parent 629e52b9d9f65cb6f5109e43e9f8b209c919a7e7

Merge "Fix the problem that AccessibilityNodeInfo maybe null and cause a crash."

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index b100891..06e96ef 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -9097,8 +9097,12 @@
             final AccessibilityNodeInfo info = createAccessibilityNodeInfo();
             structure.setChildCount(1);
             final ViewStructure root = structure.newChild(0);
-            populateVirtualStructure(root, provider, info, forAutofill);
-            info.recycle();
+            if (info != null) {
+                populateVirtualStructure(root, provider, info, forAutofill);
+                info.recycle();
+            } else {
+                Log.w(AUTOFILL_LOG_TAG, "AccessibilityNodeInfo is null.");
+            }
         }
     }