Merge "Fixed bad focus stack state when focused docked stack is removed" into nyc-dev

This commit is contained in:
TreeHugger Robot
2016-05-06 17:17:39 +00:00
committed by Android (Google) Code Review

View File

@@ -5065,7 +5065,7 @@ final class ActivityStack {
void positionTask(final TaskRecord task, int position) { void positionTask(final TaskRecord task, int position) {
final ActivityRecord topRunningActivity = task.topRunningActivityLocked(); final ActivityRecord topRunningActivity = task.topRunningActivityLocked();
final boolean wasResumed = topRunningActivity == task.stack.mResumedActivity; final boolean wasResumed = topRunningActivity == task.stack.mResumedActivity;
final ActivityStack prevStack = preAddTask(task, "positionTask", ON_TOP); final ActivityStack prevStack = preAddTask(task, "positionTask", !ON_TOP);
task.stack = this; task.stack = this;
insertTaskAtPosition(task, position); insertTaskAtPosition(task, position);
postAddTask(task, prevStack); postAddTask(task, prevStack);