Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not consider embedded task as task switch" into sc-v2-dev

Browse Source
This commit is contained in:
Riddle Hsu
2021-08-25 02:51:27 +00:00
committed by Android (Google) Code Review
parent 4de4893707 ca765813ca
commit 7ca6530658
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -1798,7 +1798,7 @@ class ActivityStarter {
mRootWindowContainer.startPowerModeLaunchIfNeeded( mRootWindowContainer.startPowerModeLaunchIfNeeded(
false /* forceSend */, mStartActivity); false /* forceSend */, mStartActivity);
final boolean isTaskSwitch = startedTask != prevTopTask; final boolean isTaskSwitch = startedTask != prevTopTask && !startedTask.isEmbedded();
mTargetRootTask.startActivityLocked(mStartActivity, mTargetRootTask.startActivityLocked(mStartActivity,
topRootTask != null ? topRootTask.getTopNonFinishingActivity() : null, newTask, topRootTask != null ? topRootTask.getTopNonFinishingActivity() : null, newTask,
isTaskSwitch, mOptions, sourceRecord); isTaskSwitch, mOptions, sourceRecord);