summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson <winsonc@google.com> 2016-09-21 12:13:55 -0700
committer Winson Chung <winsonc@google.com> 2016-09-22 19:47:41 +0000
commitffaf07fed04dfdaa4f28eebb7345a286752ebbf0 (patch)
treeb42c1d88c91c70ab3a439803b729d074a7ae4df3
parent6b87569b4c9c170772dd8a492c225d4f2e60c141 (diff)
Fixing index bounds exception when TaskViews are added while dismissing.
Bug: 31518216 Change-Id: I749aa45f54d80d524f069922ac09d2f781c87f86
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java
index 67a2595c90cd..d44aa844003f 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java
@@ -634,6 +634,12 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback {
}
int taskIndex = mCurrentTasks.indexOf(task);
+ if (taskIndex == -1) {
+ // If a task was added to the stack view after the start of the dismiss gesture,
+ // just ignore it
+ continue;
+ }
+
TaskViewTransform fromTransform = mCurrentTaskTransforms.get(taskIndex);
TaskViewTransform toTransform = mFinalTaskTransforms.get(taskIndex);