commit c8108f57c12de8e6e7cfbad406c9fd12c150cf69
author Wei Wang <wvw@google.com> Sat Jun 18 00:30:37 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jun 18 00:30:37 2016 +0000
tree 589b21bba75e8fe826f1ca766916b4ca148d0128
parent 173600e85324b911868034ece0ade6595204910f
parent 941cc66b14dc3041d31127af24d802669179c4c6

Merge \"Merge \\"remove Intent.FLAG_ACTIVITY_NEW_TASK flag check\\" into nyc-mr1-dev am: 92bc5edfa2\" into nyc-mr1-dev-plus-aosp
am: 941cc66b14

Change-Id: Icaf586d5a61be09463227a2e9c820a21d0652687

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 2a25486..21190c2 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -9260,9 +9260,6 @@
                         // sense, so turn off auto-remove.
                         intent.addFlags(Intent.FLAG_ACTIVITY_RETAIN_IN_RECENTS);
                     }
-                } else if ((intent.getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) != 0) {
-                    // Must be a new task.
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 }
                 if (!comp.equals(mLastAddedTaskComponent) || callingUid != mLastAddedTaskUid) {
                     mLastAddedTaskActivity = null;