diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStarter.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index b89cae7ca4bd..793f411b2112 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -167,8 +167,9 @@ class ActivityStarter { private Intent mNewTaskIntent; private ActivityStack mSourceStack; private ActivityStack mTargetStack; - // TODO: Is the mMoveHome flag really needed? - private boolean mMovedHome; + // Indicates that we moved other task and are going to put something on top soon, so + // we don't want to show it redundantly or accidentally change what's shown below. + private boolean mMovedOtherTask; private boolean mMovedToFront; private boolean mNoAnimation; private boolean mKeepCurTransition; @@ -206,7 +207,7 @@ class ActivityStarter { mSourceStack = null; mTargetStack = null; - mMovedHome = false; + mMovedOtherTask = false; mMovedToFront = false; mNoAnimation = false; mKeepCurTransition = false; @@ -1039,7 +1040,6 @@ class ActivityStarter { resumeTargetStackIfNeeded(); return START_RETURN_INTENT_TO_CALLER; } - setTaskFromIntentActivity(mReusedActivity); if (!mAddingToTask && mReuseTask == null) { @@ -1108,7 +1108,7 @@ class ActivityStarter { Slog.e(TAG, "Attempted Lock Task Mode violation mStartActivity=" + mStartActivity); return START_RETURN_LOCK_TASK_MODE_VIOLATION; } - if (!mMovedHome) { + if (!mMovedOtherTask) { updateTaskReturnToType(mStartActivity.task, mLaunchFlags, topStack); } } else if (mSourceRecord != null) { @@ -1472,7 +1472,7 @@ class ActivityStarter { if (mLaunchTaskBehind && mSourceRecord != null) { intentActivity.setTaskToAffiliateWith(mSourceRecord.task); } - mMovedHome = true; + mMovedOtherTask = true; // If the launch flags carry both NEW_TASK and CLEAR_TASK, the task's activities // will be cleared soon by ActivityStarter in setTaskFromIntentActivity(). @@ -1550,6 +1550,10 @@ class ActivityStarter { mReuseTask = intentActivity.task; mReuseTask.performClearTaskLocked(); mReuseTask.setIntent(mStartActivity); + // When we clear the task - focus will be adjusted, which will bring another task + // to top before we launch the activity we need. This will temporary swap their + // mTaskToReturnTo values and we don't want to overwrite them accidentally. + mMovedOtherTask = true; } else if ((mLaunchFlags & FLAG_ACTIVITY_CLEAR_TOP) != 0 || mLaunchSingleInstance || mLaunchSingleTask) { ActivityRecord top = intentActivity.task.performClearTaskLocked(mStartActivity, |