Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd2db2cd authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Fixed bad focus stack state when focused docked stack is removed" into... 

Merge "Fixed bad focus stack state when focused docked stack is removed" into nyc-dev am: 316f67bc
am: 03507ebd

* commit '03507ebd':
  Fixed bad focus stack state when focused docked stack is removed

Change-Id: I69cad505334d9e9a0164700da84099f80ef8242f
parents d216ca19 03507ebd

services/core/java/com/android/server/am/ActivityStack.java

+1 −1
Original line number Diff line number Diff line
@@ -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);