am 4b60a8d: Merge "Added check of ActivityInfo launch mode when starting activity."

* commit '4b60a8d1b8b5f8fd04df5749ce225ed57e0a1a44':
  Added check of ActivityInfo launch mode when starting activity.

Author: Dianne Hackborn

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

@@ -2762,7 +2762,8 @@ final int startActivityUncheckedLocked(ActivityRecord r,
                         // 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) {