am b5981aa8: am ee7c30e1: Merge "Avoid capture all black screenshot bitmap"

* commit 'b5981aa8d18dbd952ff74a75f962d4ec98f38807': Avoid capture all black screenshot bitmap
2014-12-01 16:49:34 +00:00
parent 8596021c3b b5981aa8d1
commit 1764465d81
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -6189,7 +6189,7 @@ public class WindowManagerService extends IWindowManager.Stub
                    }

                    if (ws.mAppToken != null && ws.mAppToken.token == appToken &&
-                            ws.isDisplayedLw()) {
+                            ws.isDisplayedLw() && winAnim.mSurfaceShown) {
                        screenshotReady = true;
                    }