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

Commit 108c167e authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Automerger Merge Worker
Browse files

Merge "Fix IndexOutOfBoundsException when calling dispatchProvideStructure()"... 

Merge "Fix IndexOutOfBoundsException when calling dispatchProvideStructure()" into sc-dev am: 9e229725

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

Change-Id: Id7dc77bfcd4635d2220b800ffb0478bfc7f35dd2
parents 26886ae9 9e229725

core/java/android/view/ViewGroup.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -3581,7 +3581,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        }

        }





        structure.setChildCount(childrenCount);

        structure.setChildCount(childrenCount);

        ArrayList<View> preorderedList = buildOrderedChildList();

        ArrayList<View> tempPreorderedList = buildOrderedChildList();

        ArrayList<View> preorderedList =

                tempPreorderedList != null ? new ArrayList<>(tempPreorderedList) : null;

        boolean customOrder = preorderedList == null

        boolean customOrder = preorderedList == null

                && isChildrenDrawingOrderEnabled();

                && isChildrenDrawingOrderEnabled();

        for (int i = 0; i < childrenCount; i++) {

        for (int i = 0; i < childrenCount; i++) {