summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2014-12-01 16:38:14 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-12-01 16:38:14 +0000
commitee7c30e1f9a40b6498f7aa374e71bb0bfc6482a3 (patch)
tree4677c6e8a6ac6e9de6ed2e34ad8a959202c6c9d2
parent6829daa44a66333ef869dbcd655eac220c34561b (diff)
parente3ca04839783c8cd30fe1009f041f81615adec5d (diff)
Merge "Avoid capture all black screenshot bitmap"
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 7f7d93b01697..1c03cedff31e 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -6101,7 +6101,7 @@ public class WindowManagerService extends IWindowManager.Stub
}
if (ws.mAppToken != null && ws.mAppToken.token == appToken &&
- ws.isDisplayedLw()) {
+ ws.isDisplayedLw() && winAnim.mSurfaceShown) {
screenshotReady = true;
}