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

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

Revert "Add missing check of avoidMoveToFront when starting activity" 

This reverts commit ec891577.

Reason for revert: b/338016782

Change-Id: I8ab04b0e6ac709bf91a39e78c524886cc4069c6c
parent ec891577

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

+2 −2
Original line number Diff line number Diff line
@@ -2167,7 +2167,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 +2196,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");

        }