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 am: 7ca6530658 am: e4cdbf6bd6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15667296

Change-Id: I8cbae447d5e571d5c320663f963e13d283db8a26
This commit is contained in:
Riddle Hsu
2021-08-25 03:29:34 +00:00
committed by Automerger Merge Worker
parent b3e917360e e4cdbf6bd6
commit 2760bdf223
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(
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);