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

Commit aee29007 authored by Chris Li's avatar Chris Li
Browse files

[DO NOT MERGE]Fix IndexOutOfBoundsException for TDA stack 

Before, it used DC.getStackCount() to loop TDA stacks, which caused
issue when there are multiple TDAs.

Bug: 173823058
Test: manual
Change-Id: I60bcf72c37b2f90fc655566022a107a75b49966a
parent a421f8ff

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

+1 −1
Original line number Diff line number Diff line
@@ -3246,7 +3246,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            int numTaskContainers = display.getTaskDisplayAreaCount();

            for (int tdaNdx = 0; tdaNdx < numTaskContainers; tdaNdx++) {

                final TaskDisplayArea taskDisplayArea = display.getTaskDisplayAreaAt(tdaNdx);

                final int numStacks = display.getStackCount();

                final int numStacks = taskDisplayArea.getStackCount();

                for (int stackNdx = 0; stackNdx < numStacks; ++stackNdx) {

                    final ActivityStack stack = taskDisplayArea.getStackAt(stackNdx);

                    stack.finishVoiceTask(session);