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

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

Merge "Do not resume activity if behind a translucent task"

parents 76dfa05d 287657ca

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

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

        // activities are actually behind other fullscreen activities, but still required

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

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

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

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

                && mTaskFragment.isTopActivityFocusable()

                && mTaskFragment.canBeResumed(starting)

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

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





        ArrayList<TaskFragment> adjacentTaskFragments = null;

        ArrayList<TaskFragment> adjacentTaskFragments = null;

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

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




            try {

            try {

                if (mTaskSupervisor.realStartActivityLocked(r, mApp,

                if (mTaskSupervisor.realStartActivityLocked(r, mApp,

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

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

                        true /* checkConfig */)) {

                    mHasActivityStarted = true;

                    mHasActivityStarted = true;

                }

                }

            } catch (RemoteException e) {

            } catch (RemoteException e) {