diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-09-23 12:58:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-23 12:58:10 -0700 |
| commit | b939e35274334d1f5e71a526efe8d235eb6d7387 (patch) | |
| tree | 9292319858bd01ec3bd01f132405c9a13620ed7e /services/java/com/android/server/am | |
| parent | 925b6a715f42296dee7d80c3a3b4024d264a3c97 (diff) | |
| parent | 8da429e80d1778d7bcfbfbd64355c70fb466b3ce (diff) | |
| download | frameworks_base-b939e35274334d1f5e71a526efe8d235eb6d7387.zip frameworks_base-b939e35274334d1f5e71a526efe8d235eb6d7387.tar.gz frameworks_base-b939e35274334d1f5e71a526efe8d235eb6d7387.tar.bz2 | |
Merge "Fix issue #7209355, #7214271." into jb-mr1-dev
Diffstat (limited to 'services/java/com/android/server/am')
| -rwxr-xr-x | services/java/com/android/server/am/ActivityStack.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 32907f8..1707ff0 100755 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -4390,6 +4390,8 @@ final class ActivityStack { while (j < NA) { ActivityRecord ar = mHistory.get(j); if (!ar.finishing && ar.task.taskId == taskId) { + thumbs.root = ar; + thumbs.rootIndex = j; holder = ar.thumbHolder; if (holder != null) { thumbs.mainThumbnail = holder.lastThumbnail; @@ -4404,9 +4406,6 @@ final class ActivityStack { return thumbs; } - thumbs.root = mHistory.get(j); - thumbs.rootIndex = j; - ArrayList<TaskAccessInfo.SubTask> subtasks = new ArrayList<TaskAccessInfo.SubTask>(); thumbs.subtasks = subtasks; while (j < NA) { |