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

Commit 351f9901 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into sc-v2-dev

parents 70260553 0a4f661e

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

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ class EnsureActivitiesVisibleHelper { 
        // activities are actually behind other fullscreen activities, but still required

        // to be visible (such as performing Recents animation).

        final boolean resumeTopActivity = mTop != null && !mTop.mLaunchTaskBehind

                && mTaskFragment.isTopActivityFocusable()

                && mTaskFragment.canBeResumed(starting)

                && (starting == null || !starting.isDescendantOf(mTaskFragment));



        ArrayList<TaskFragment> adjacentTaskFragments = null;

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

+2 −1
Original line number Diff line number Diff line
@@ -1979,7 +1979,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 


        try {

            if (mTaskSupervisor.realStartActivityLocked(r, app,

                    top == r && r.isFocusable() /*andResume*/, true /*checkConfig*/)) {

                    top == r && r.getTask().canBeResumed(r) /*andResume*/,

                    true /*checkConfig*/)) {

                mTmpBoolean = true;

            }

        } catch (RemoteException e) {