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

Merge \"Don\'t update mTaskToReturnTo when task is cleared\" into nyc-dev

Browse Source 
am: 1a77efe9ba

Change-Id: Idb9aad2fb3161552b699f271bed940cb47fd98ad
This commit is contained in:
Andrii Kulian
2016-06-09 20:33:57 +00:00
committed by android-build-merger
parent 7fbbbd5ea1 1a77efe9ba
commit bf914699d5
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -167,8 +167,9 @@ class ActivityStarter {
private Intent mNewTaskIntent; private Intent mNewTaskIntent;
private ActivityStack mSourceStack; private ActivityStack mSourceStack;
private ActivityStack mTargetStack; private ActivityStack mTargetStack;
// TODO: Is the mMoveHome flag really needed? // Indicates that we moved other task and are going to put something on top soon, so
private boolean mMovedHome; // we don't want to show it redundantly or accidentally change what's shown below.
private boolean mMovedOtherTask;
private boolean mMovedToFront; private boolean mMovedToFront;
private boolean mNoAnimation; private boolean mNoAnimation;
private boolean mKeepCurTransition; private boolean mKeepCurTransition;
@@ -206,7 +207,7 @@ class ActivityStarter {
mSourceStack = null; mSourceStack = null;
mTargetStack = null; mTargetStack = null;
mMovedHome = false; mMovedOtherTask = false;
mMovedToFront = false; mMovedToFront = false;
mNoAnimation = false; mNoAnimation = false;
mKeepCurTransition = false; mKeepCurTransition = false;
@@ -1039,7 +1040,6 @@ class ActivityStarter {
resumeTargetStackIfNeeded(); resumeTargetStackIfNeeded();
return START_RETURN_INTENT_TO_CALLER; return START_RETURN_INTENT_TO_CALLER;
} }
setTaskFromIntentActivity(mReusedActivity); setTaskFromIntentActivity(mReusedActivity);
if (!mAddingToTask && mReuseTask == null) { if (!mAddingToTask && mReuseTask == null) {
@@ -1108,7 +1108,7 @@ class ActivityStarter {
Slog.e(TAG, "Attempted Lock Task Mode violation mStartActivity=" + mStartActivity); Slog.e(TAG, "Attempted Lock Task Mode violation mStartActivity=" + mStartActivity);
return START_RETURN_LOCK_TASK_MODE_VIOLATION; return START_RETURN_LOCK_TASK_MODE_VIOLATION;
} }
if (!mMovedHome) { if (!mMovedOtherTask) {
updateTaskReturnToType(mStartActivity.task, mLaunchFlags, topStack); updateTaskReturnToType(mStartActivity.task, mLaunchFlags, topStack);
} }
} else if (mSourceRecord != null) { } else if (mSourceRecord != null) {
@@ -1472,7 +1472,7 @@ class ActivityStarter {
if (mLaunchTaskBehind && mSourceRecord != null) { if (mLaunchTaskBehind && mSourceRecord != null) {
intentActivity.setTaskToAffiliateWith(mSourceRecord.task); intentActivity.setTaskToAffiliateWith(mSourceRecord.task);
} }
mMovedHome = true; mMovedOtherTask = true;
// If the launch flags carry both NEW_TASK and CLEAR_TASK, the task's activities // If the launch flags carry both NEW_TASK and CLEAR_TASK, the task's activities
// will be cleared soon by ActivityStarter in setTaskFromIntentActivity(). // will be cleared soon by ActivityStarter in setTaskFromIntentActivity().
@@ -1550,6 +1550,10 @@ class ActivityStarter {
mReuseTask = intentActivity.task; mReuseTask = intentActivity.task;
mReuseTask.performClearTaskLocked(); mReuseTask.performClearTaskLocked();
mReuseTask.setIntent(mStartActivity); 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 } else if ((mLaunchFlags & FLAG_ACTIVITY_CLEAR_TOP) != 0
|| mLaunchSingleInstance || mLaunchSingleTask) { || mLaunchSingleInstance || mLaunchSingleTask) {
ActivityRecord top = intentActivity.task.performClearTaskLocked(mStartActivity, ActivityRecord top = intentActivity.task.performClearTaskLocked(mStartActivity,