commit 6461f91ec9789b4dc27e0689146725153d5c76e3
author Riddle Hsu <riddlehsu@google.com> Mon Jul 08 01:22:59 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 08 01:22:59 2024 +0000
tree 8aaa6e535c5334d2e98a5f83ec8e9dc27c46dcd2
parent 142a8e13e71e057c1a2a4c22042de1e137f71bc0
parent 45094e9943bd280df731dca742cbad718aecf7a1

Merge "Do not move home when starting recent task from non-recents" into main

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

diff --git a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
index d65a106..00b6453 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
@@ -2737,9 +2737,9 @@
         final ActivityOptions activityOptions = options != null
                 ? options.getOptions(this)
                 : null;
-        boolean moveHomeTaskForward = true;
         synchronized (mService.mGlobalLock) {
             final boolean isCallerRecents = mRecentTasks.isCallerRecents(callingUid);
+            boolean moveHomeTaskForward = isCallerRecents;
             int activityType = ACTIVITY_TYPE_UNDEFINED;
             if (activityOptions != null) {
                 activityType = activityOptions.getLaunchActivityType();