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

Commit eaebd8be authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

Merge "Fix ViewPager crash for a11y z order." into nyc-dev 

am: fd32b894

* commit 'fd32b894':
  Fix ViewPager crash for a11y z order.
parents 0ea6bc41 fd32b894

core/java/android/view/View.java

+9 −0
Original line number Diff line number Diff line
@@ -6874,6 +6874,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @param info The info whose drawing order should be populated

     */

    private void populateAccessibilityNodeInfoDrawingOrderInParent(AccessibilityNodeInfo info) {

        /*

         * If the view's bounds haven't been set yet, layout has not completed. In that situation,

         * drawing order may not be well-defined, and some Views with custom drawing order may

         * not be initialized sufficiently to respond properly getChildDrawingOrder.

         */

        if ((mPrivateFlags & PFLAG_HAS_BOUNDS) == 0) {

            info.setDrawingOrder(0);

            return;

        }

        int drawingOrderInParent = 1;

        // Iterate up the hierarchy if parents are not important for a11y

        View viewAtDrawingLevel = this;