diff options
| author | Ed Heyl <> | 2009-03-24 22:23:14 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 22:23:14 -0700 |
| commit | 18523b6f317f7a75eba30810855b4d3dbb40073a (patch) | |
| tree | ae47564a86b84dfc4ebfd470f221dde89a12835d | |
| parent | 3e7b3c0f270d2bf86fb701a94e55cb135480d571 (diff) | |
| download | frameworks_base-18523b6f317f7a75eba30810855b4d3dbb40073a.zip frameworks_base-18523b6f317f7a75eba30810855b4d3dbb40073a.tar.gz frameworks_base-18523b6f317f7a75eba30810855b4d3dbb40073a.tar.bz2 | |
Automated import from //branches/master/...@142240,142240
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index a7dac61..d676c00 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -5992,7 +5992,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen final boolean clearWhenTaskReset = (target.intent.getFlags() &Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET) != 0; - if (!finishOnTaskLaunch && target.resultTo != null) { + if (!finishOnTaskLaunch && !clearWhenTaskReset && target.resultTo != null) { // If this activity is sending a reply to a previous // activity, we can't do anything with it now until // we reach the start of the reply chain. @@ -6002,7 +6002,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen if (replyChainEnd < 0) { replyChainEnd = targetI; } - } else if (!finishOnTaskLaunch && allowTaskReparenting + } else if (!finishOnTaskLaunch && !clearWhenTaskReset && allowTaskReparenting && target.taskAffinity != null && !target.taskAffinity.equals(task.affinity)) { // If this activity has an affinity for another |