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

Commit d05970ec authored by Johan Viktorsson's avatar Johan Viktorsson Committed by Gerrit Code Review
Browse files

Added check of ActivityInfo launch mode when starting activity. 

When starting a singleTop activity from a singleInstance activity,
the onNewIntent() callback was not called when expected. The
reason for this was that only the launchMode specified on the
intent was checked and not the launchMode specified in the manifest.

Fixes issue 17137.

Change-Id: I1a9bc1007d6f5145bf93a6161534732bf5214b7a
parent ee8fc547

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

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