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 am: 42147f0ff3

Browse Source 
am: d82efd36dc

Change-Id: I48fb59f6afa681e4846e13384befa12b7c7a7bf1
This commit is contained in:
Andrii Kulian
2016-06-23 02:35:28 +00:00
committed by android-build-merger
parent a0c99bda20 d82efd36dc
commit 60de130179
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);