summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/am
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-01-26 13:28:16 -0800
committerDianne Hackborn <hackbod@google.com>2011-01-26 13:28:16 -0800
commit57f1ac41337b019f6ad568769264ec519f917cf7 (patch)
treedc82fd33cb98c9a7677186ecbe6dfaa86826f1c5 /services/java/com/android/server/am
parent66a9f48bbf9c2dfc25c1e520fcc05e3d5c2abe84 (diff)
downloadframeworks_base-57f1ac41337b019f6ad568769264ec519f917cf7.zip
frameworks_base-57f1ac41337b019f6ad568769264ec519f917cf7.tar.gz
frameworks_base-57f1ac41337b019f6ad568769264ec519f917cf7.tar.bz2
Fix issue #3380072: Switching in and out of gmail not preserving position in label
We were doubly-decreasing the task's activity count, so when selected from recent tasks it would re-launch the last Intent rather than switching to its current state. Change-Id: I6e58c930a0755ae0142604d42b5cd2c668a2b492
Diffstat (limited to 'services/java/com/android/server/am')
-rw-r--r--services/java/com/android/server/am/ActivityStack.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 2040cbd..5b44d39 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -3187,7 +3187,6 @@ public class ActivityStack {
EventLog.writeEvent(EventLogTags.AM_FINISH_ACTIVITY,
System.identityHashCode(r),
r.task.taskId, r.shortComponentName, reason);
- r.task.numActivities--;
if (index < (mHistory.size()-1)) {
ActivityRecord next = (ActivityRecord)mHistory.get(index+1);
if (next.task == r.task) {