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

Commit 4b60a8d1 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android code review
Browse files

Merge "Added check of ActivityInfo launch mode when starting activity."

parents 60d1e1a0 f363dfd2

services/java/com/android/server/am/ActivityStack.java

+2 −1
Original line number Diff line number Diff line
@@ -2762,7 +2762,8 @@ final class ActivityStack { 
                        // If the top activity in the task is the root

                        // activity, deliver this new intent to it if it

                        // desires.

                        if ((launchFlags&Intent.FLAG_ACTIVITY_SINGLE_TOP) != 0

                        if (((launchFlags&Intent.FLAG_ACTIVITY_SINGLE_TOP) != 0

                                || r.launchMode == ActivityInfo.LAUNCH_SINGLE_TOP)

                                && taskTop.realActivity.equals(r.realActivity)) {

                            logStartActivity(EventLogTags.AM_NEW_INTENT, r, taskTop.task);

                            if (taskTop.frontOfTask) {