diff options
| author | 2012-08-30 15:59:40 -0700 | |
|---|---|---|
| committer | 2012-08-30 15:59:40 -0700 | |
| commit | 862c383530d64e6c493fb519f567dd5778d9d48c (patch) | |
| tree | 05dc04c43705026ebecf0c882f6427f9e35b057b | |
| parent | 147ef9448540adaa4312e3cbc01adfc3c7902f50 (diff) | |
| parent | 4b60a8d1b8b5f8fd04df5749ce225ed57e0a1a44 (diff) | |
am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
* commit '4b60a8d1b8b5f8fd04df5749ce225ed57e0a1a44':
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) { |