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

Merge "Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 am: d33151bf4f" into nyc-mr1-dev-plus-aosp

Browse Source 
am: 97e9d8e9df

* commit '97e9d8e9df61ae5aa7accbd98b20da745edea1a4':
  Put launch adjacent activity in a new task if the activity does exist

Change-Id: I8f00b7d34c6441aebe8d7d488b79c888d4c47e52
This commit is contained in:
Chris Tate
2016-05-20 17:37:04 +00:00
committed by android-build-merger
parent c33d1055bf 97e9d8e9df
commit 065f9db98c
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1396,11 +1396,18 @@ class ActivityStarter {
final TaskRecord task = mSupervisor.anyTaskForIdLocked(mOptions.getLaunchTaskId());
intentActivity = task != null ? task.getTopActivity() : null;
} else if (putIntoExistingTask) {
// See if there is a task to bring to the front. If this is a SINGLE_INSTANCE
// activity, there can be one and only one instance of it in the history, and it is
// always in its own unique task, so we do a special search.
intentActivity = mLaunchSingleInstance ? mSupervisor.findActivityLocked(mIntent, mStartActivity.info)
: mSupervisor.findTaskLocked(mStartActivity);
if (mLaunchSingleInstance) {
// There can be one and only one instance of single instance activity in the
// history, and it is always in its own unique task, so we do a special search.
intentActivity = mSupervisor.findActivityLocked(mIntent, mStartActivity.info);
} else if ((mLaunchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) != 0) {
// For the launch adjacent case we only want to put the activity in an existing
// task if the activity already exists in the history.
intentActivity = mSupervisor.findActivityLocked(mIntent, mStartActivity.info);
} else {
// Otherwise find the best task to put the activity in.
intentActivity = mSupervisor.findTaskLocked(mStartActivity);
}
}
return intentActivity;
}