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

Commit d40e9805 authored by Daniel Chapin's avatar Daniel Chapin Committed by Android Build Coastguard Worker
Browse files

Revert "Add missing check of avoidMoveToFront when starting activity" 

This reverts commit 7721382d.

Reason for revert: b/341240750
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0b40303804d748a9aa2cd9d40cc76c34a1eb2816)
Merged-In: I698824f002ac73b26be8202155f5781244e93635
Change-Id: I698824f002ac73b26be8202155f5781244e93635
parent 75416335

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

+2 −3
Original line number Diff line number Diff line
@@ -1768,7 +1768,6 @@ class ActivityStarter { 
            if (!avoidMoveToFront() && (mService.mHomeProcess == null

                    || mService.mHomeProcess.mUid != realCallingUid)

                    && (prevTopTask != null && prevTopTask.isActivityTypeHomeOrRecents())

                    && !targetTask.isActivityTypeHomeOrRecents()

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

                mCanMoveToFrontCode = MOVE_TO_FRONT_AVOID_LEGACY;

            }
@@ -2167,7 +2166,7 @@ class ActivityStarter { 
            // We don't need to start a new activity, and the client said not to do anything

            // if that is the case, so this is it!  And for paranoia, make sure we have

            // correctly resumed the top activity.

            if (!mMovedToFront && mDoResume && !avoidMoveToFront()) {

            if (!mMovedToFront && mDoResume) {

                ProtoLog.d(WM_DEBUG_TASKS, "Bring to front target: %s from %s", mTargetRootTask,

                        targetTaskTop);

                mTargetRootTask.moveToFront("intentActivityFound");
@@ -2196,7 +2195,7 @@ class ActivityStarter { 
        if (mMovedToFront) {

            // We moved the task to front, use starting window to hide initial drawn delay.

            targetTaskTop.showStartingWindow(true /* taskSwitch */);

        } else if (mDoResume && !avoidMoveToFront()) {

        } else if (mDoResume) {

            // Make sure the root task and its belonging display are moved to topmost.

            mTargetRootTask.moveToFront("intentActivityFound");

        }