From fc33cdf71dc58652cb15b7d2f1143affff404fc9 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 3 Dec 2014 13:16:48 -0800 Subject: Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776) --- .../src/com/android/systemui/recents/views/TaskStackView.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'packages/SystemUI/src/com/android/systemui') 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 2623db3..33a36f6 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -530,11 +530,12 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal /** Resets the focused task. */ void resetFocusedTask() { - if ((mStack != null) && (0 <= mFocusedTaskIndex) && - (mFocusedTaskIndex < mStack.getTaskCount())) { + if ((0 <= mFocusedTaskIndex) && (mFocusedTaskIndex < mStack.getTaskCount())) { Task t = mStack.getTasks().get(mFocusedTaskIndex); TaskView tv = getChildViewForTask(t); - tv.unsetFocusedTask(); + if (tv != null) { + tv.unsetFocusedTask(); + } } mFocusedTaskIndex = -1; } -- cgit v1.1