Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8108f57 authored by Wei Wang's avatar Wei Wang Committed by android-build-merger
Browse files

Merge \"Merge \\"remove Intent.FLAG_ACTIVITY_NEW_TASK flag check\\" into... 

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

Change-Id: Icaf586d5a61be09463227a2e9c820a21d0652687
parents 173600e8 941cc66b

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

+0 −3
Original line number Diff line number Diff line
@@ -9260,9 +9260,6 @@ public final class ActivityManagerService extends ActivityManagerNative 
                        // 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;