am aed35d6b: Merge "Not include fullscreen opaque window on screenshot"

* commit 'aed35d6b57b4076b9b405c384f6d1f65253ab2b0': Not include fullscreen opaque window on screenshot
2014-11-26 17:41:57 +00:00
parent 6c3548a961 aed35d6b57
commit 77f8112d52
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -6084,6 +6084,10 @@ public class WindowManagerService extends IWindowManager.Stub
                            ws.isDisplayedLw()) {
                        screenshotReady = true;
                    }
+
+                    if (ws.isFullscreen(dw, dh) && ws.isOpaqueDrawn()){
+                        break;
+                    }
                }

                if (appToken != null && appWin == null) {