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

Merge "Disallow changing stacks if top activity" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-21 00:11:49 +00:00
committed by Android (Google) Code Review
parent 28609360cf 4ad9856eb8
commit 1fa356289e
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1432,7 +1432,7 @@ class ActivityStarter {
== (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK); == (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);
if (!willClearTask) { if (!willClearTask) {
final ActivityStack launchStack = getLaunchStack( final ActivityStack launchStack = getLaunchStack(
mStartActivity, mLaunchFlags, mStartActivity.task, mOptions, true); mStartActivity, mLaunchFlags, mStartActivity.task, mOptions);
if (launchStack == null || launchStack == mTargetStack) { if (launchStack == null || launchStack == mTargetStack) {
// We only want to move to the front, if we aren't going to launch on a // We only want to move to the front, if we aren't going to launch on a
// different stack. If we launch on a different stack, we will put the // different stack. If we launch on a different stack, we will put the
@@ -1606,8 +1606,11 @@ class ActivityStarter {
// We only want to allow changing stack if the target task is not the top one, // We only want to allow changing stack if the target task is not the top one,
// otherwise we would move the launching task to the other side, rather than show // otherwise we would move the launching task to the other side, rather than show
// two side by side. // two side by side.
final boolean launchToSideAllowed = sourceTask.stack.topTask() != sourceTask; final boolean moveStackAllowed = sourceTask.stack.topTask() != sourceTask;
mTargetStack = getLaunchStack(mStartActivity, mLaunchFlags, mStartActivity.task, mOptions, launchToSideAllowed); if (moveStackAllowed) {
mTargetStack = getLaunchStack(mStartActivity, mLaunchFlags, mStartActivity.task,
mOptions);
}
if (mTargetStack == null) { if (mTargetStack == null) {
mTargetStack = sourceTask.stack; mTargetStack = sourceTask.stack;
@@ -1780,7 +1783,7 @@ class ActivityStarter {
return mSupervisor.mHomeStack; return mSupervisor.mHomeStack;
} }
ActivityStack stack = getLaunchStack(r, launchFlags, task, aOptions, true); ActivityStack stack = getLaunchStack(r, launchFlags, task, aOptions);
if (stack != null) { if (stack != null) {
return stack; return stack;
} }
@@ -1845,7 +1848,7 @@ class ActivityStarter {
} }
private ActivityStack getLaunchStack(ActivityRecord r, int launchFlags, TaskRecord task, private ActivityStack getLaunchStack(ActivityRecord r, int launchFlags, TaskRecord task,
ActivityOptions aOptions, boolean launchToSideAllowed) { ActivityOptions aOptions) {
final int launchStackId = final int launchStackId =
(aOptions != null) ? aOptions.getLaunchStackId() : INVALID_STACK_ID; (aOptions != null) ? aOptions.getLaunchStackId() : INVALID_STACK_ID;
@@ -1857,7 +1860,7 @@ class ActivityStarter {
return mSupervisor.getStack(FULLSCREEN_WORKSPACE_STACK_ID, CREATE_IF_NEEDED, ON_TOP); return mSupervisor.getStack(FULLSCREEN_WORKSPACE_STACK_ID, CREATE_IF_NEEDED, ON_TOP);
} }
if (!launchToSideAllowed || (launchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) == 0) { if ((launchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) == 0) {
return null; return null;
} }
// Otherwise handle adjacent launch. // Otherwise handle adjacent launch.