am 68ca59e9: am b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo

Merge commit '68ca59e9e69ab4c997987fb0390382a2461386eb' into kraken

* commit '68ca59e9e69ab4c997987fb0390382a2461386eb':
  Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET

1 files changed, 11 insertions, 2 deletions

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 1486a1d..13690bc 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -4078,10 +4078,19 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
                 System.identityHashCode(r),
                 r.task.taskId, r.shortComponentName, reason);
         r.task.numActivities--;
-        if (r.frontOfTask && index < (mHistory.size()-1)) {
+        if (index < (mHistory.size()-1)) {
             HistoryRecord next = (HistoryRecord)mHistory.get(index+1);
             if (next.task == r.task) {
-                next.frontOfTask = true;
+                if (r.frontOfTask) {
+                    // The next activity is now the front of the task.
+                    next.frontOfTask = true;
+                }
+                if ((r.intent.getFlags()&Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET) != 0) {
+                    // If the caller asked that this activity (and all above it)
+                    // be cleared when the task is reset, don't lose that information,
+                    // but propagate it up to the next activity.
+                    next.intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+                }
             }
         }