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

Merge "Fix not able to enter split screen with trampoline launch" into tm-qpr-dev

Browse Source
This commit is contained in:
Jerry Chang
2023-01-05 07:30:08 +00:00
committed by Android (Google) Code Review
parent cc678f0416 1d0a70b8da
commit 71c5174af9
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2867,9 +2867,9 @@ class ActivityStarter {
if (differentTopTask && !mAvoidMoveToFront) { if (differentTopTask && !mAvoidMoveToFront) {
mStartActivity.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT); mStartActivity.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
if (mSourceRecord == null || (mSourceRootTask.getTopNonFinishingActivity() != null // TODO(b/264487981): Consider using BackgroundActivityStartController to determine
&& mSourceRootTask.getTopNonFinishingActivity().getTask() // whether to bring the launching activity to the front.
== mSourceRecord.getTask())) { if (mSourceRecord == null || inTopNonFinishingTask(mSourceRecord)) {
// We really do want to push this one into the user's face, right now. // We really do want to push this one into the user's face, right now.
if (mLaunchTaskBehind && mSourceRecord != null) { if (mLaunchTaskBehind && mSourceRecord != null) {
intentActivity.setTaskToAffiliateWith(mSourceRecord.getTask()); intentActivity.setTaskToAffiliateWith(mSourceRecord.getTask());
@@ -2928,6 +2928,20 @@ class ActivityStarter {
mRootWindowContainer.getDefaultTaskDisplayArea(), mTargetRootTask); mRootWindowContainer.getDefaultTaskDisplayArea(), mTargetRootTask);
} }
private boolean inTopNonFinishingTask(ActivityRecord r) {
if (r == null || r.getTask() == null) {
return false;
}
final Task rTask = r.getTask();
final Task parent = rTask.getCreatedByOrganizerTask() != null
? rTask.getCreatedByOrganizerTask() : r.getRootTask();
final ActivityRecord topNonFinishingActivity = parent != null
? parent.getTopNonFinishingActivity() : null;
return topNonFinishingActivity != null && topNonFinishingActivity.getTask() == rTask;
}
private void resumeTargetRootTaskIfNeeded() { private void resumeTargetRootTaskIfNeeded() {
if (mDoResume) { if (mDoResume) {
final ActivityRecord next = mTargetRootTask.topRunningActivity( final ActivityRecord next = mTargetRootTask.topRunningActivity(