Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5404eb28 authored by Daniel Norman's avatar Daniel Norman Committed by Automerger Merge Worker
Browse files

Merge "Fix the problem that AccessibilityNodeInfo maybe null and cause a crash." am: 27c5bed4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2606576



Change-Id: If22bf34788bbdd57d41d826baefb5d238c30c37a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6be3a74 27c5bed4

core/java/android/view/View.java

+6 −2
Original line number Diff line number Diff line
@@ -9137,8 +9137,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            final AccessibilityNodeInfo info = createAccessibilityNodeInfo();

            structure.setChildCount(1);

            final ViewStructure root = structure.newChild(0);

            if (info != null) {

                populateVirtualStructure(root, provider, info, forAutofill);

                info.recycle();

            } else {

                Log.w(AUTOFILL_LOG_TAG, "AccessibilityNodeInfo is null.");

            }

        }

    }