Merge "Fix issue #18240452: No recents screenshot when resuming from keyguard." into lmp-mr1-dev

This commit is contained in:
Wale Ogunwale
2014-11-05 01:14:21 +00:00
committed by Android (Google) Code Review

View File

@@ -835,7 +835,7 @@ final class ActivityStack {
prev.task.touchActiveTime();
clearLaunchTime(prev);
final ActivityRecord next = mStackSupervisor.topRunningActivityLocked();
if (mService.mHasRecents && (next == null || next.noDisplay || next.task != prev.task)) {
if (mService.mHasRecents && (next == null || next.noDisplay || next.task != prev.task || uiSleeping)) {
prev.updateThumbnail(screenshotActivities(prev), null);
}
stopFullyDrawnTraceIfNeeded();