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

Commit 83972553 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

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

am: 42147f0f

Change-Id: I6e0cc9c5a1b6245735ac9ba2a645231619c38eec
parents 89fe3e01 42147f0f

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

+2 −1
Original line number Diff line number Diff line
@@ -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);