Merge "Fixing crash when swiping away last task."

2015-10-30 23:17:29 +00:00
parent d3efe539cb 3e9964ffdb
commit 2a1d77ef16
1 changed files with 3 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -1273,8 +1273,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
            // the next task
            RecentsConfiguration config = Recents.getConfiguration();
            RecentsActivityLaunchState launchState = config.getLaunchState();
-            setFocusedTask(taskIndex - 1,
-                    !mStack.getTasks().get(taskIndex - 1).isFreeformTask() /* scrollToTask */,
+            boolean isFreeformTask = taskIndex > 0 ?
+                    mStack.getTasks().get(taskIndex - 1).isFreeformTask() : false;
+            setFocusedTask(taskIndex - 1, !isFreeformTask /* scrollToTask */,
                    launchState.launchedWithAltTab);
        }
    }