From 3cce8dd16ff5aed41810f0d2dec7a5135eb9c1e5 Mon Sep 17 00:00:00 2001
From: Charles Chen <charlesccchen@google.com>
Date: Fri, 6 Aug 2021 18:01:57 +0800
Subject: [PATCH] Fix IOOBE in forAllLeafTasksAndLeafTaskFragments

fixes: 195729546
Test: manual - reproducible step in b/195729546#comment1
Change-Id: I7a75a45518ad9633c4c314d2509ccedc30a062d8
---
 services/core/java/com/android/server/wm/Task.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 7d911bc049f0a..ec79bf2e12eb1 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -3251,7 +3251,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) {
@@ -3261,7 +3261,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) {