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

Commit 2dbed0c2 authored by Charles Chen's avatar Charles Chen Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I2b8e20c89540740a72baf55f2fd91e3a4bc9b576
parents 5191a90b 57f0866d

services/core/java/com/android/server/wm/Task.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {