commit 57f0866d497a38eb581550454f895f29faa4c241
author Charles Chen <charlesccchen@google.com> Fri Aug 06 13:21:04 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 06 13:21:04 2021 +0000
tree 213aa33b7947065057b531696b375ebcb1e3a0c1
parent c26e08020c887dd6cf31f97e8103b7dcbede0f2c
parent 3cce8dd16ff5aed41810f0d2dec7a5135eb9c1e5

Merge "Fix IOOBE in forAllLeafTasksAndLeafTaskFragments" into sc-v2-dev

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

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 69ad59a..1e0aafa 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -3252,7 +3252,7 @@
             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 @@
                 }
             } 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) {