am 2d63144e
: Merge "Fix issue #3380072: Switching in and out of gmail not preserving position in label" into honeycomb
* commit '2d63144ed94dff0832d051ec355f56649244dd4e': Fix issue #3380072: Switching in and out of gmail not preserving position in label
This commit is contained in:
@ -3187,7 +3187,6 @@ public class ActivityStack {
|
|||||||
EventLog.writeEvent(EventLogTags.AM_FINISH_ACTIVITY,
|
EventLog.writeEvent(EventLogTags.AM_FINISH_ACTIVITY,
|
||||||
System.identityHashCode(r),
|
System.identityHashCode(r),
|
||||||
r.task.taskId, r.shortComponentName, reason);
|
r.task.taskId, r.shortComponentName, reason);
|
||||||
r.task.numActivities--;
|
|
||||||
if (index < (mHistory.size()-1)) {
|
if (index < (mHistory.size()-1)) {
|
||||||
ActivityRecord next = (ActivityRecord)mHistory.get(index+1);
|
ActivityRecord next = (ActivityRecord)mHistory.get(index+1);
|
||||||
if (next.task == r.task) {
|
if (next.task == r.task) {
|
||||||
|
Reference in New Issue
Block a user