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

Merge \"Don\'t compare intent filters on singleTask adjacent launch\" into nyc-dev

Browse Source 
am: 42147f0ff3

Change-Id: Ie767b54e2622a823d8e2fe2a864d788c3a81df74
This commit is contained in:
Andrii Kulian
2016-06-23 02:27:25 +00:00
committed by android-build-merger
parent ce7fc6c0a1 42147f0ff3
commit d82efd36dc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1454,7 +1454,8 @@ class ActivityStarter {
} else if ((mLaunchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) != 0) { } else if ((mLaunchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) != 0) {
// For the launch adjacent case we only want to put the activity in an existing // For the launch adjacent case we only want to put the activity in an existing
// task if the activity already exists in the history. // task if the activity already exists in the history.
intentActivity = mSupervisor.findActivityLocked(mIntent, mStartActivity.info, true); intentActivity = mSupervisor.findActivityLocked(mIntent, mStartActivity.info,
!mLaunchSingleTask);
} else { } else {
// Otherwise find the best task to put the activity in. // Otherwise find the best task to put the activity in.
intentActivity = mSupervisor.findTaskLocked(mStartActivity); intentActivity = mSupervisor.findTaskLocked(mStartActivity);