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

Merge "Prioritize reused activity's stack over computed stack." into oc-dev am: ac56b8adde am: cbf1bd40ea

Browse Source 
am: 014d0ebc8f

Change-Id: I2f53a9795addeecbbd9fefede269a7318b78b786
This commit is contained in:
Bryce Lee
2017-06-09 11:32:04 +00:00
committed by android-build-merger
parent 6e676cc61b 014d0ebc8f
commit c188bd0fbd
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2083,6 +2083,10 @@ class ActivityStarter {
private ActivityStack getLaunchStack(ActivityRecord r, int launchFlags, TaskRecord task,
ActivityOptions aOptions) {
// We are reusing a task, keep the stack!
if (mReuseTask != null) {
return mReuseTask.getStack();
}
// If the activity is of a specific type, return the associated stack, creating it if
// necessary
@@ -2096,11 +2100,6 @@ class ActivityStarter {
return mSupervisor.getStack(ASSISTANT_STACK_ID, CREATE_IF_NEEDED, ON_TOP);
}
// We are reusing a task, keep the stack!
if (mReuseTask != null) {
return mReuseTask.getStack();
}
final int launchDisplayId =
(aOptions != null) ? aOptions.getLaunchDisplayId() : INVALID_DISPLAY;