diff options
| author | 2012-08-30 16:01:59 -0700 | |
|---|---|---|
| committer | 2012-08-30 16:01:59 -0700 | |
| commit | 1a907db07ea105ea65e146713f436ed072d7084b (patch) | |
| tree | f80a27fa31152a67c9d67da08166e73a675d73f1 | |
| parent | 30b5bea07b7357b5063a12e54f002adae9af2b39 (diff) | |
| parent | 862c383530d64e6c493fb519f567dd5778d9d48c (diff) | |
am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
* commit '862c383530d64e6c493fb519f567dd5778d9d48c':
Added check of ActivityInfo launch mode when starting activity.
| -rwxr-xr-x | services/java/com/android/server/am/ActivityStack.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 9171e476094a..b9e63b7095cf 100755 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -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) { |