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

am 9be76b0e: am ed247003: Merge "Fix issue #18240452: No recents screenshot when resuming from keyguard." into lmp-mr1-dev automerge: c56a1f1

Browse Source 
* commit '9be76b0e4054e954e84e1317353e55a137bbb1a3':
  Fix issue #18240452: No recents screenshot when resuming from keyguard.
This commit is contained in:
Wale Ogunwale
2014-11-05 04:18:02 +00:00
committed by Android Git Automerger
parent 2fe08558cc 9be76b0e40
commit 207319580f
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();
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();