Merge \\\"Don\\\'t compare intent filters on singleTask adjacent launch\\\" into nyc-dev am: 42147f0ff3 am: d82efd36dc

am: 60de130179 Change-Id: Ib9d550db454a6a243845a70651127282b723b2d7
2016-06-23 02:41:02 +00:00
parent 5e7855b39f 60de130179
commit b2adcb97ee
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
@@ -1454,7 +1454,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);