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

Merge "Do not append NEW_TASK flag when caller activity is finishing" into tm-qpr-dev am: 715ec8b312

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

Change-Id: Ie3b22cb7bb2810191a3b21b470780cb09caf05e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-12-13 03:24:18 +00:00
committed by Automerger Merge Worker
parent 7cb5a1414b 715ec8b312
commit d9bdb999c5
1 changed files with 2 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,8 +200,6 @@ class ActivityStarter {
@VisibleForTesting
ActivityRecord mMovedToTopActivity;
private ActivityInfo mNewTaskInfo;
private Intent mNewTaskIntent;
private Task mSourceRootTask;
private Task mTargetRootTask;
// The task that the last activity was started into. We currently reset the actual start
@@ -610,8 +608,6 @@ class ActivityStarter {
mInTaskFragment = starter.mInTaskFragment;
mAddingToTask = starter.mAddingToTask;
mNewTaskInfo = starter.mNewTaskInfo;
mNewTaskIntent = starter.mNewTaskIntent;
mSourceRootTask = starter.mSourceRootTask;
mTargetTask = starter.mTargetTask;
@@ -1549,9 +1545,6 @@ class ActivityStarter {
voiceSession, voiceInteractor, restrictedBgActivity);
computeLaunchingTaskFlags();
computeSourceRootTask();
mIntent.setFlags(mLaunchFlags);
boolean dreamStopping = false;
@@ -2202,8 +2195,6 @@ class ActivityStarter {
mAddingToTaskFragment = null;
mAddingToTask = false;
mNewTaskInfo = null;
mNewTaskIntent = null;
mSourceRootTask = null;
mTargetRootTask = null;
@@ -2237,6 +2228,7 @@ class ActivityStarter {
mOptions = options;
mCallingUid = r.launchedFromUid;
mSourceRecord = sourceRecord;
mSourceRootTask = mSourceRecord != null ? mSourceRecord.getRootTask() : null;
mVoiceSession = voiceSession;
mVoiceInteractor = voiceInteractor;
mRestrictedBgActivity = restrictedBgActivity;
@@ -2484,39 +2476,6 @@ class ActivityStarter {
}
}
private void computeSourceRootTask() {
if (mSourceRecord == null) {
mSourceRootTask = null;
return;
}
if (!mSourceRecord.finishing) {
mSourceRootTask = mSourceRecord.getRootTask();
return;
}
// If the source is finishing, we can't further count it as our source. This is because the
// task it is associated with may now be empty and on its way out, so we don't want to
// blindly throw it in to that task. Instead we will take the NEW_TASK flow and try to find
// a task for it. But save the task information so it can be used when creating the new task.
if ((mLaunchFlags & FLAG_ACTIVITY_NEW_TASK) == 0) {
Slog.w(TAG, "startActivity called from finishing " + mSourceRecord
+ "; forcing " + "Intent.FLAG_ACTIVITY_NEW_TASK for: " + mIntent);
mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK;
// 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();
if (sourceTask == null || sourceTask.getTopNonFinishingActivity() == null) {
mNewTaskInfo = mSourceRecord.info;
mNewTaskIntent = sourceTask != null ? sourceTask.intent : null;
}
}
mSourceRecord = null;
mSourceRootTask = null;
}
/**
* Decide whether the new activity should be inserted into an existing task. Returns null
* if not or an ActivityRecord with the task into which the new activity should be added.
@@ -2714,8 +2673,7 @@ class ActivityStarter {
private void setNewTask(Task taskToAffiliate) {
final boolean toTop = !mLaunchTaskBehind && !mAvoidMoveToFront;
final Task task = mTargetRootTask.reuseOrCreateTask(
mNewTaskInfo != null ? mNewTaskInfo : mStartActivity.info,
mNewTaskIntent != null ? mNewTaskIntent : mIntent, mVoiceSession,
mStartActivity.info, mIntent, mVoiceSession,
mVoiceInteractor, toTop, mStartActivity, mSourceRecord, mOptions);
task.mTransitionController.collectExistenceChange(task);
addOrReparentStartingActivity(task, "setTaskFromReuseOrCreateNewTask");