am d42e7b57: am c0542a96: am 7bd54c11: Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev
* commit 'd42e7b57de7bb3323aa6c0d680378da000664a07':
Fixing Recents crash when resetting focus of TaskView already returned to the pool.
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 9df0db6..bef4cd1 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 @@
/** 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 @@
}
// Reset the stack state
- resetFocusedTask();
mStackViewsDirty = true;
mStackViewsClipDirty = true;
mAwaitingFirstLayout = true;