From ffaf07fed04dfdaa4f28eebb7345a286752ebbf0 Mon Sep 17 00:00:00 2001 From: Winson Date: Wed, 21 Sep 2016 12:13:55 -0700 Subject: [PATCH] Fixing index bounds exception when TaskViews are added while dismissing. Bug: 31518216 Change-Id: I749aa45f54d80d524f069922ac09d2f781c87f86 --- .../android/systemui/recents/views/TaskStackViewTouchHandler.java | 6 ++++++ 1 file changed, 6 insertions(+) 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); -- 2.11.0