commit ed247003857b7d1c0200a2e3102a6d263eb457bb
author Wale Ogunwale <ogunwale@google.com> Wed Nov 05 01:25:09 2014 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 05 01:25:09 2014 +0000
tree e6b774e66f489f786b004434fc475747d17ddade
parent a04a5e82f0b84d57394c28600e3b142d649880cb
parent c56a1f17153844c8015a440ed52e84bbce0b894f

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

* commit 'c56a1f17153844c8015a440ed52e84bbce0b894f':
  Fix issue #18240452: No recents screenshot when resuming from keyguard.

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

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index e1b8278..b61bd8a 100755
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -835,7 +835,7 @@
         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();