diff options
| author | 2021-08-24 18:52:13 +0800 | |
|---|---|---|
| committer | 2021-08-24 18:52:13 +0800 | |
| commit | ca765813ca657a6e52f5e7590c3152023b96f359 (patch) | |
| tree | facd35e8c16e12cdca383bfab36edddbf9a68310 | |
| parent | 5cbb831c10a64bab5f3aa40e34ff6018d9922440 (diff) | |
Do not consider embedded task as task switch
For example:
Task A - TaskFragment - Activity X
- TaskFragment - Task B (embedded) - Activity Y
If Y starts Activity Z in Task B, even if A and B are different,
we don't want to show starting window because B is a part of A
from user's perspective.
Bug: 197595621
Test: Start activity from embedded task fragment to the same
task fragment.
Change-Id: I9ec40e77b675c857f46747babd3144b2989042f6
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityStarter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index f6757f599d7c..af5382721dee 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -1798,7 +1798,7 @@ class ActivityStarter { mRootWindowContainer.startPowerModeLaunchIfNeeded( false /* forceSend */, mStartActivity); - final boolean isTaskSwitch = startedTask != prevTopTask; + final boolean isTaskSwitch = startedTask != prevTopTask && !startedTask.isEmbedded(); mTargetRootTask.startActivityLocked(mStartActivity, topRootTask != null ? topRootTask.getTopNonFinishingActivity() : null, newTask, isTaskSwitch, mOptions, sourceRecord); |