Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: c56a1f1

* commit 'c56a1f17153844c8015a440ed52e84bbce0b894f':
  Fix issue #18240452: No recents screenshot when resuming from keyguard.
This commit is contained in:
Wale Ogunwale
2014-11-05 01:25:09 +00:00
committed by android-build-merger
parent a04a5e82f0 c56a1f1715
commit ed24700385
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -835,7 +835,7 @@ final class ActivityStack {
prev.task.touchActiveTime(); prev.task.touchActiveTime();
clearLaunchTime(prev); clearLaunchTime(prev);
final ActivityRecord next = mStackSupervisor.topRunningActivityLocked(); 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); prev.updateThumbnail(screenshotActivities(prev), null);
} }
stopFullyDrawnTraceIfNeeded(); stopFullyDrawnTraceIfNeeded();