summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Li <lihongyu@google.com> 2020-11-29 07:26:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-11-29 07:26:50 +0000
commitdd316294ff2fe66789f449e4e95bcc597ed9c68f (patch)
tree6f43e5f0e39f7e0a5988d03ca093a92b724c0767
parent5b849b3cdc036082a64b475f41aaeb1b73c26a93 (diff)
parentaee29007cff18dceeb367a96d9345bec109c8df6 (diff)
[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
-rw-r--r--services/core/java/com/android/server/wm/RootWindowContainer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index 39aa60bce2bc..0d2f57ed5622 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -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);