diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-01-26 19:07:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 19:07:46 -0800 |
| commit | 831a010aec283d1d0a90297d0f9452c0fde16d8c (patch) | |
| tree | 0b94ad8f5fc3dfebfbcb5bda46786248da11d5e7 /services/java/com/android/server/am | |
| parent | 0abd82f099e9c799c856018eca9ebd5d3941cb24 (diff) | |
| parent | 5640392f584c64f048180ac75218b5c7f9281b76 (diff) | |
| download | frameworks_base-831a010aec283d1d0a90297d0f9452c0fde16d8c.zip frameworks_base-831a010aec283d1d0a90297d0f9452c0fde16d8c.tar.gz frameworks_base-831a010aec283d1d0a90297d0f9452c0fde16d8c.tar.bz2 | |
am 5640392f: am 2d63144e: Merge "Fix issue #3380072: Switching in and out of gmail not preserving position in label" into honeycomb
* commit '5640392f584c64f048180ac75218b5c7f9281b76':
Fix issue #3380072: Switching in and out of gmail not preserving position in label
Diffstat (limited to 'services/java/com/android/server/am')
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 1 |
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) { |