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

Commit 6ae51925 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge \\"Resume only activities in focused stack\\" into nyc-dev am: 06b1d786 

am: bb7c5aca

Change-Id: Ibc9dec731ffa71d67f66431329d10a9707b69d1d
parents dd56b1cb bb7c5aca

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

+2 −1
Original line number Diff line number Diff line
@@ -1706,7 +1706,8 @@ final class ActivityStack { 
        final boolean stackInvisible = stackVisibility != STACK_VISIBLE;

        final boolean stackVisibleBehind = stackVisibility == STACK_VISIBLE_ACTIVITY_BEHIND;

        boolean behindFullscreenActivity = stackInvisible;

        boolean resumeNextActivity = isFocusable() && (isInStackLocked(starting) == null);

        boolean resumeNextActivity = mStackSupervisor.isFocusedStack(this)

                && (isInStackLocked(starting) == null);

        boolean behindTranslucentActivity = false;

        final ActivityRecord visibleBehind = getVisibleBehindActivity();

        for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {