[DO NOT MERGE]Fix IndexOutOfBoundsException for TDA stack am: aee29007cf

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

Change-Id: I1110ff15be59a872a1016e490e1e5c76e5a85658
This commit is contained in:
Chris Li
2020-11-29 07:26:50 +00:00
committed by Automerger Merge Worker

View File

@@ -3246,7 +3246,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
int numTaskContainers = display.getTaskDisplayAreaCount(); int numTaskContainers = display.getTaskDisplayAreaCount();
for (int tdaNdx = 0; tdaNdx < numTaskContainers; tdaNdx++) { for (int tdaNdx = 0; tdaNdx < numTaskContainers; tdaNdx++) {
final TaskDisplayArea taskDisplayArea = display.getTaskDisplayAreaAt(tdaNdx); final TaskDisplayArea taskDisplayArea = display.getTaskDisplayAreaAt(tdaNdx);
final int numStacks = display.getStackCount(); final int numStacks = taskDisplayArea.getStackCount();
for (int stackNdx = 0; stackNdx < numStacks; ++stackNdx) { for (int stackNdx = 0; stackNdx < numStacks; ++stackNdx) {
final ActivityStack stack = taskDisplayArea.getStackAt(stackNdx); final ActivityStack stack = taskDisplayArea.getStackAt(stackNdx);
stack.finishVoiceTask(session); stack.finishVoiceTask(session);