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

am: 316f67bcfb

* commit '316f67bcfbc8b57a115a83d3484b8edde972570b':
  Fixed bad focus stack state when focused docked stack is removed

Change-Id: I4060b57b8e6f55ee20a9536a90fea2d0901043b1
This commit is contained in:
Wale Ogunwale
2016-05-06 17:25:47 +00:00
committed by android-build-merger

View File

@@ -5065,7 +5065,7 @@ final class ActivityStack {
void positionTask(final TaskRecord task, int position) {
final ActivityRecord topRunningActivity = task.topRunningActivityLocked();
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;
insertTaskAtPosition(task, position);
postAddTask(task, prevStack);