diff options
| author | Dianne Hackborn <hackbod@android.com> | 2012-08-30 16:04:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-30 16:04:19 -0700 |
| commit | b2dd4e87ae8ac6a0402b7a0ed37201f27bcb1b9c (patch) | |
| tree | 0a851d3b9e7dd8c1f41404e4be2eb34e679ad98f /services/java/com/android/server/am | |
| parent | 0fa814d7e6d16e68fa715175cf3122b19fd9e59c (diff) | |
| parent | 1a907db07ea105ea65e146713f436ed072d7084b (diff) | |
| download | frameworks_base-b2dd4e87ae8ac6a0402b7a0ed37201f27bcb1b9c.zip frameworks_base-b2dd4e87ae8ac6a0402b7a0ed37201f27bcb1b9c.tar.gz frameworks_base-b2dd4e87ae8ac6a0402b7a0ed37201f27bcb1b9c.tar.bz2 | |
am 1a907db0: am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
* commit '1a907db07ea105ea65e146713f436ed072d7084b':
Added check of ActivityInfo launch mode when starting activity.
Diffstat (limited to 'services/java/com/android/server/am')
| -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 a389edc..ef4e9be 100755 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -2776,7 +2776,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) { |