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

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

am 6e40deb8: am 88923c97: Merge "Fix issue #7214462: Some recent thumbnails... 

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

* commit '6e40deb8':
  Fix issue #7214462: Some recent thumbnails are black.
parents 0f85c577 6e40deb8

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

+4 −1
Original line number Diff line number Diff line
@@ -4337,6 +4337,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;

    }
@@ -4351,7 +4354,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;

        }