From b90e761b285e3c173772b6fe7333a17dca8679e4 Mon Sep 17 00:00:00 2001 From: Riddle Hsu Date: Tue, 30 Apr 2024 16:12:54 +0000 Subject: Revert "Add missing check of avoidMoveToFront when starting activity" This reverts commit ec8915773a30199dd5b2dffb6a5be8e82297ded7. Reason for revert: b/338016782 Change-Id: I8ab04b0e6ac709bf91a39e78c524886cc4069c6c --- services/core/java/com/android/server/wm/ActivityStarter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 5bd845f03104..330336760413 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -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"); } -- cgit v1.2.3-59-g8ed1b