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

Commit b465dfa7 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Return START_TASK_TO_FRONT when launching transient hide task" into udc-qpr-dev

parents 061d85a4 f0ef8814

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

+6 −2
Original line number Diff line number Diff line
@@ -1691,7 +1691,9 @@ class ActivityStarter { 
            }

            // When running transient transition, the transient launch target should keep on top.

            // So disallow the transient hide activity to move itself to front, e.g. trampoline.

            if (!mAvoidMoveToFront && r.mTransitionController.isTransientHide(targetTask)) {

            if (!mAvoidMoveToFront && (mService.mHomeProcess == null

                    || mService.mHomeProcess.mUid != realCallingUid)

                    && r.mTransitionController.isTransientHide(targetTask)) {

                mAvoidMoveToFront = true;

            }

            mPriorAboveTask = TaskDisplayArea.getRootTaskAbove(targetTask.getRootTask());
@@ -2973,7 +2975,9 @@ class ActivityStarter { 
                    // should be START_DELIVERED_TO_TOP instead of START_TASK_TO_FRONT.

                    final boolean wasTopOfVisibleRootTask = intentActivity.isVisibleRequested()

                            && intentActivity.inMultiWindowMode()

                            && intentActivity == mTargetRootTask.topRunningActivity();

                            && intentActivity == mTargetRootTask.topRunningActivity()

                            && !intentActivity.mTransitionController.isTransientHide(

                                    mTargetRootTask);

                    // We only want to move to the front, if we aren't going to launch on a

                    // different root task. If we launch on a different root task, we will put the

                    // task on top there.