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

Commit 42147f0f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 737be111 039ba489

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);