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

Commit 5ba0eeb0 authored by Sally Yuen's avatar Sally Yuen Committed by Automerger Merge Worker
Browse files

Merge "Don't query a null AccessibiiltyNodeInfo when populating ViewStructure"... 

Merge "Don't query a null AccessibiiltyNodeInfo when populating ViewStructure" into sc-dev am: ea5ce681

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

Change-Id: I1b562e4a2587f39600233f31a883f6bc903e0fe1
parents b57f5689 ea5ce681

core/java/android/view/View.java

+5 −3
Original line number Diff line number Diff line
@@ -10079,12 +10079,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
                }

                AccessibilityNodeInfo cinfo = provider.createAccessibilityNodeInfo(

                        AccessibilityNodeInfo.getVirtualDescendantId(info.getChildId(i)));

                if (cinfo != null) {

                    ViewStructure child = structure.newChild(i);

                    populateVirtualStructure(child, provider, cinfo, forAutofill);

                    cinfo.recycle();

                }

            }

        }

    }















    /**















     * Dispatch creation of {@link ViewStructure} down the hierarchy.  The default