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

Commit 35d45d80 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... 

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

Change-Id: I1f44567347b7364dfd545cb75a8db43ee1a047f7
parents a0c99bda 83972553

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

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