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

Merge "Migrate task intent/info to new task only if source task is empty" into tm-dev

Browse Source
This commit is contained in:
Louis Chang
2022-04-14 06:56:30 +00:00
committed by Android (Google) Code Review
parent fe1b41da4f c043fa586d
commit df3e2162b0
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2644,14 +2644,16 @@ class ActivityStarter {
Slog.w(TAG, "startActivity called from finishing " + mSourceRecord Slog.w(TAG, "startActivity called from finishing " + mSourceRecord
+ "; forcing " + "Intent.FLAG_ACTIVITY_NEW_TASK for: " + mIntent); + "; forcing " + "Intent.FLAG_ACTIVITY_NEW_TASK for: " + mIntent);
mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK; mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK;
mNewTaskInfo = mSourceRecord.info;
// It is not guaranteed that the source record will have a task associated with it. For, // It is not guaranteed that the source record will have a task associated with it.
// example, if this method is being called for processing a pending activity launch, it // For example, if this method is being called for processing a pending activity
// is possible that the activity has been removed from the task after the launch was // launch, it is possible that the activity has been removed from the task after the
// enqueued. // launch was enqueued.
final Task sourceTask = mSourceRecord.getTask(); final Task sourceTask = mSourceRecord.getTask();
mNewTaskIntent = sourceTask != null ? sourceTask.intent : null; if (sourceTask == null || sourceTask.getTopNonFinishingActivity() == null) {
mNewTaskInfo = mSourceRecord.info;
mNewTaskIntent = sourceTask != null ? sourceTask.intent : null;
}
} }
mSourceRecord = null; mSourceRecord = null;
mSourceRootTask = null; mSourceRootTask = null;