From daa4a78682dfc838602f870aabb7fd003c919477 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 1 Jun 2015 16:02:58 -0700 Subject: [PATCH] Don't focus view for invalid task index. Bug: 21322861 Change-Id: I7b8397d18b488bd8f459e578b64d6e82e4f1437d --- .../com/android/systemui/recents/views/TaskStackView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java index 3a97a417e4199..5f151e87a680a 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -880,8 +880,10 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal } // Start the focus animation when alt-tabbing - if (mConfig.launchedWithAltTab && !mConfig.launchedHasConfigurationChanged) { - TaskView tv = getChildViewForTask(mStack.getTasks().get(mFocusedTaskIndex)); + ArrayList tasks = mStack.getTasks(); + if (mConfig.launchedWithAltTab && !mConfig.launchedHasConfigurationChanged && + 0 <= mFocusedTaskIndex && mFocusedTaskIndex < tasks.size()) { + TaskView tv = getChildViewForTask(tasks.get(mFocusedTaskIndex)); if (tv != null) { tv.setFocusedTask(true); }