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

Commit e60945f9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by android-build-merger
Browse files

Merge "Fixed bug with activity moved to pinned stack left in resumed state."... 

Merge "Fixed bug with activity moved to pinned stack left in resumed state." into nyc-dev am: fe31ada9
am: 0fae7645

* commit '0fae7645':
  Fixed bug with activity moved to pinned stack left in resumed state.

Change-Id: If3590244ac41ab6646f80e6132582743ecd5835d
parents a2614dd6 0fae7645

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

+1 −1
Original line number Diff line number Diff line
@@ -2270,7 +2270,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        final ActivityRecord r = task.getTopActivity();

        final ActivityStack prevStack = task.stack;

        final boolean wasFocused = isFocusedStack(prevStack) && (topRunningActivityLocked() == r);

        final boolean wasResumed = wasFocused && (prevStack.mResumedActivity == r);

        final boolean wasResumed = prevStack.mResumedActivity == r;

        // In some cases the focused stack isn't the front stack. E.g. pinned stack.

        // Whenever we are moving the top activity from the front stack we want to make sure to move

        // the stack to the front.