Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a74bbf06 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 0fa2673e: am ae828e86: am f46bb1d9: Merge "Fix issue #11086275: Thumbnail... 

am 0fa2673e: am ae828e86: am f46bb1d9: Merge "Fix issue #11086275: Thumbnail only created once for top activity" into klp-dev

* commit '0fa2673e':
  Fix issue #11086275: Thumbnail only created once for top activity
parents 56211d2c 0fa2673e

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

+9 −0
Original line number Diff line number Diff line
@@ -673,6 +673,14 @@ final class ActivityStack { 
            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 @@ final class ActivityStack { 


        if (w > 0) {

            if (who != mLastScreenshotActivity || mLastScreenshotBitmap == null

                    || mLastScreenshotActivity.state == ActivityState.RESUMED

                    || mLastScreenshotBitmap.getWidth() != w

                    || mLastScreenshotBitmap.getHeight() != h) {

                mLastScreenshotActivity = who;