Merge "Migrate task intent/info to new task only if source task is empty" into tm-dev am: df3e2162b0 am: 77be4e31dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17739083
Change-Id: I51050353ddae57d0719fd0366f302093150eaca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index 36a7c77..75d4621 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -2644,14 +2644,16 @@
Slog.w(TAG, "startActivity called from finishing " + mSourceRecord
+ "; forcing " + "Intent.FLAG_ACTIVITY_NEW_TASK for: " + mIntent);
mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK;
- mNewTaskInfo = mSourceRecord.info;
- // It is not guaranteed that the source record will have a task associated with it. For,
- // example, if this method is being called for processing a pending activity launch, it
- // is possible that the activity has been removed from the task after the launch was
- // enqueued.
+ // It is not guaranteed that the source record will have a task associated with it.
+ // For example, if this method is being called for processing a pending activity
+ // launch, it is possible that the activity has been removed from the task after the
+ // launch was enqueued.
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;
mSourceRootTask = null;