Fix issue #7214462: Some recent thumbnails are black.

Dianne Hackborn · Dianne Hackborn · commit 6a864959e09a · 2012-09-21T18:46:11.000-07:00
Change-Id: I9a2704c95a8701c9fb6755662fb47d4743099bf9
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
@@ -4329,6 +4329,9 @@ public ActivityManager.TaskThumbnails getTaskThumbnailsLocked(TaskRecord tr) {
         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 @@ public Bitmap getTaskTopThumbnailLocked(TaskRecord tr) {
         // 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;
         }

Original file line number	Diff line number	Diff line change
`@@ -4329,6 +4329,9 @@ public ActivityManager.TaskThumbnails getTaskThumbnailsLocked(TaskRecord tr) {`
`4329`	`4329`	`if (resumed != null && resumed.thumbHolder == tr) {`
`4330`	`4330`	`info.mainThumbnail = resumed.stack.screenshotActivities(resumed);`
`4331`	`4331`	`}`
	`4332`	`+ if (info.mainThumbnail == null) {`
	`4333`	`+ info.mainThumbnail = tr.lastThumbnail;`
	`4334`	`+ }`
`4332`	`4335`	`return info;`
`4333`	`4336`	`}`
`4334`	`4337`
`@@ -4343,7 +4346,7 @@ public Bitmap getTaskTopThumbnailLocked(TaskRecord tr) {`
`4343`	`4346`	`// thumbnail to return.`
`4344`	`4347`	`TaskAccessInfo info = getTaskAccessInfoLocked(tr.taskId, true);`
`4345`	`4348`	`if (info.numSubThumbbails <= 0) {`
`4346`		`- return info.mainThumbnail;`
	`4349`	`+ return info.mainThumbnail != null ? info.mainThumbnail : tr.lastThumbnail;`
`4347`	`4350`	`} else {`
`4348`	`4351`	`return info.subtasks.get(info.numSubThumbbails-1).holder.lastThumbnail;`
`4349`	`4352`	`}`