diff options
| author | Winson Chung <winsonc@google.com> | 2015-06-01 23:07:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-01 23:07:37 +0000 |
| commit | c85cd734bdf75a55608fae1d5a47b4ac72db4ee8 (patch) | |
| tree | 43e03f09efafa833938a141ff20a5b3b0a504823 | |
| parent | dc49d5f8ae9005a119172f72ccda1de9bc85c2d9 (diff) | |
| parent | daa4a78682dfc838602f870aabb7fd003c919477 (diff) | |
| download | frameworks_base-c85cd734bdf75a55608fae1d5a47b4ac72db4ee8.zip frameworks_base-c85cd734bdf75a55608fae1d5a47b4ac72db4ee8.tar.gz frameworks_base-c85cd734bdf75a55608fae1d5a47b4ac72db4ee8.tar.bz2 | |
Merge "Don't focus view for invalid task index." into mnc-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java | 6 |
1 files 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 3a97a41..5f151e8 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<Task> 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); } |