From 7ae4b7e1965951ac74fc10204bb238ff174b52c6 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Thu, 6 Nov 2014 17:07:52 -0800 Subject: [PATCH] Fixing Recents crash when resetting focus of TaskView already returned to the pool. Change-Id: Iee789e4e726d5f035ec518f4fec444afecc2bbf2 --- .../src/com/android/systemui/recents/views/TaskStackView.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 9df0db611d08a..bef4cd1159660 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -156,6 +156,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal /** Resets this TaskStackView for reuse. */ void reset() { + // Reset the focused task + resetFocusedTask(); + // Return all the views to the pool int childCount = getChildCount(); for (int i = childCount - 1; i >= 0; i--) { @@ -175,7 +178,6 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal } // Reset the stack state - resetFocusedTask(); mStackViewsDirty = true; mStackViewsClipDirty = true; mAwaitingFirstLayout = true;