Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d63144e authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #3380072: Switching in and out of gmail not preserving... 

Merge "Fix issue #3380072: Switching in and out of gmail not preserving position in label" into honeycomb
parents 278a04eb 57f1ac41

services/java/com/android/server/am/ActivityStack.java

+0 −1
Original line number Diff line number Diff line
@@ -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) {