commit 90192a6165f37207fa8ceb15c07aa9582327c294
author Craig Mautner <cmautner@google.com> Thu Nov 21 08:50:05 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 21 08:50:05 2013 -0800
tree d5d196848916e0750723d5ef866678232d875468
parent 47b260d071859a8c20bb0af2bcc095e253f7046c
parent 0495f4eded46efd7035ed672dc933ec6430b93fd

am 0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplications()"

* commit '0495f4eded46efd7035ed672dc933ec6430b93fd':
  Make SurfaceView layers captured by screenshotApplications()

services/java/com/android/server/wm/WindowManagerService.java

diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index ce40e73..585b2e0 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -5383,8 +5383,7 @@
 
                     // We keep on including windows until we go past a full-screen
                     // window.
-                    boolean fullscreen = ws.isFullscreen(dw, dh);
-                    including = !ws.mIsImWindow && !fullscreen;
+                    including = !ws.mIsImWindow && !ws.isFullscreen(dw, dh);
 
                     final WindowStateAnimator winAnim = ws.mWinAnimator;
                     if (maxLayer < winAnim.mSurfaceLayer) {
@@ -5409,11 +5408,6 @@
                             ws.isDisplayedLw()) {
                         screenshotReady = true;
                     }
-
-                    if (fullscreen) {
-                        // No point in continuing down through windows.
-                        break;
-                    }
                 }
 
                 if (appToken != null && appWin == null) {