Merge "Fix issue #11086275: Thumbnail only created once for top activity" into klp-dev
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 1014502..422e2b1 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -673,6 +673,14 @@
return null;
}
+ TaskRecord tr = who.task;
+ if (tr.intent != null && (tr.intent.getFlags()
+ &Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0) {
+ // If this task is being excluded from recents, we don't want to take
+ // the expense of capturing a thumbnail, since we will never show it.
+ return null;
+ }
+
Resources res = mService.mContext.getResources();
int w = mThumbnailWidth;
int h = mThumbnailHeight;
@@ -685,6 +693,7 @@
if (w > 0) {
if (who != mLastScreenshotActivity || mLastScreenshotBitmap == null
+ || mLastScreenshotActivity.state == ActivityState.RESUMED
|| mLastScreenshotBitmap.getWidth() != w
|| mLastScreenshotBitmap.getHeight() != h) {
mLastScreenshotActivity = who;