am c0542a96: am 7bd54c11: Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev

* commit 'c0542a96db6e2c59c00d9bfa030383eb82c1f41a':
  Fixing Recents crash when resetting focus of TaskView already returned to the pool.
This commit is contained in:
Winson Chung
2014-11-07 01:45:06 +00:00
committed by Android Git Automerger

View File

@@ -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;