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

Merge "Consider new_task flag when launching with adjacent" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-06-09 01:30:29 +00:00
committed by Android (Google) Code Review
parent cd3592e2e3 2369dfab4f
commit a4b7722d54
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2501,11 +2501,6 @@ class ActivityStarter {
} }
} }
if ((mLaunchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) != 0 && mSourceRecord == null) {
// ignore the flag if there is no the sourceRecord
mLaunchFlags &= ~FLAG_ACTIVITY_LAUNCH_ADJACENT;
}
// We'll invoke onUserLeaving before onPause only if the launching // We'll invoke onUserLeaving before onPause only if the launching
// activity did not explicitly state that this is an automated launch. // activity did not explicitly state that this is an automated launch.
mSupervisor.mUserLeaving = (mLaunchFlags & FLAG_ACTIVITY_NO_USER_ACTION) == 0; mSupervisor.mUserLeaving = (mLaunchFlags & FLAG_ACTIVITY_NO_USER_ACTION) == 0;
@@ -2700,6 +2695,12 @@ class ActivityStarter {
mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK; mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK;
} }
} }
if ((mLaunchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) != 0
&& ((mLaunchFlags & FLAG_ACTIVITY_NEW_TASK) == 0 || mSourceRecord == null)) {
// ignore the flag if there is no the sourceRecord or without new_task flag
mLaunchFlags &= ~FLAG_ACTIVITY_LAUNCH_ADJACENT;
}
} }
private void computeSourceRootTask() { private void computeSourceRootTask() {