am 88923c97: Merge "Fix issue #7214462: Some recent thumbnails are black." into jb-mr1-dev (6e40deb8) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}