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

am: 42147f0ff3 Change-Id: I6e0cc9c5a1b6245735ac9ba2a645231619c38eec
2016-06-23 02:27:06 +00:00
parent 89fe3e0169 42147f0ff3
commit 83972553b4
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -1425,7 +1425,8 @@ class ActivityStarter {
            } 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, true);
+                intentActivity = mSupervisor.findActivityLocked(mIntent, mStartActivity.info,
+                        !mLaunchSingleTask);
            } else {
                // Otherwise find the best task to put the activity in.
                intentActivity = mSupervisor.findTaskLocked(mStartActivity);