Merge "Fix IOOBE in forAllLeafTasksAndLeafTaskFragments" into sc-v2-dev am: 57f0866d49

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

Change-Id: I2b8e20c89540740a72baf55f2fd91e3a4bc9b576
This commit is contained in:
Charles Chen
2021-08-06 13:33:09 +00:00
committed by Automerger Merge Worker

View File

@@ -3252,7 +3252,7 @@ class Task extends TaskFragment {
boolean consumed = false;
if (traverseTopToBottom) {
for (int i = task.mChildren.size() - 1; i >= 0; --i) {
final WindowContainer child = mChildren.get(i);
final WindowContainer child = task.mChildren.get(i);
if (child.asTaskFragment() != null) {
child.forAllLeafTaskFragments(callback, traverseTopToBottom);
} else if (child.asActivityRecord() != null && !consumed) {
@@ -3262,7 +3262,7 @@ class Task extends TaskFragment {
}
} else {
for (int i = 0; i < task.mChildren.size(); i++) {
final WindowContainer child = mChildren.get(i);
final WindowContainer child = task.mChildren.get(i);
if (child.asTaskFragment() != null) {
child.forAllLeafTaskFragments(callback, traverseTopToBottom);
} else if (child.asActivityRecord() != null && !consumed) {