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

Commit 72aa97e7 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d47874 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812573

Change-Id: I1e4c3d42668d5f6459f4a07436edb7ff46f3e90f
parents e7493443 f2d47874

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

+3 −1
Original line number Diff line number Diff line
@@ -2147,7 +2147,9 @@ class ActivityStack extends ConfigurationContainer { 
            boolean aboveTop = top != null;

            final boolean stackShouldBeVisible = shouldBeVisible(starting);

            boolean behindFullscreenActivity = !stackShouldBeVisible;

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

            boolean resumeNextActivity = isFocusable()

                    && getVisibility(starting) == STACK_VISIBILITY_VISIBLE

                    && isInStackLocked(starting) == null;

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

                final TaskRecord task = mTaskHistory.get(taskNdx);

                final ArrayList<ActivityRecord> activities = task.mActivities;