Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 88923c97: Merge "Fix issue #7214462: Some recent thumbnails are black." into jb-mr1-dev

Browse Source 
* commit '88923c973e3b58593c4d0fb6724addcefc53004f':
  Fix issue #7214462: Some recent thumbnails are black.
This commit is contained in:
Dianne Hackborn
2012-09-24 09:27:20 -07:00
committed by Android Git Automerger
parent 66b6dc6964 88923c973e
commit 6e40deb81c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/am/ActivityStack.java
View File

@@ -4329,6 +4329,9 @@ final class ActivityStack {
if (resumed != null && resumed.thumbHolder == tr) {
info.mainThumbnail = resumed.stack.screenshotActivities(resumed);
}
if (info.mainThumbnail == null) {
info.mainThumbnail = tr.lastThumbnail;
}
return info;
}
@@ -4343,7 +4346,7 @@ final class ActivityStack {
// thumbnail to return.
TaskAccessInfo info = getTaskAccessInfoLocked(tr.taskId, true);
if (info.numSubThumbbails <= 0) {
return info.mainThumbnail;
return info.mainThumbnail != null ? info.mainThumbnail : tr.lastThumbnail;
} else {
return info.subtasks.get(info.numSubThumbbails-1).holder.lastThumbnail;
}