Merge "Fix IOOBE in forAllLeafTasksAndLeafTaskFragments" into sc-v2-dev (57f0866d) · Commits · e / os / android_frameworks_base

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