Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix IndexOutOfBoundsException when calling dispatchProvideStructure()" into sc-dev

Browse Source
This commit is contained in:
Ahaan Ugale
2021-05-14 21:15:18 +00:00
committed by Android (Google) Code Review
parent 83a5e6ed18 a9ddb1e0da
commit 9e22972568
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/ViewGroup.java
View File

@@ -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++) {