summaryrefslogtreecommitdiff
path: root/services/java
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2013-11-21 16:45:28 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2013-11-21 16:45:29 +0000
commit0495f4eded46efd7035ed672dc933ec6430b93fd (patch)
tree41e9040d63a8368cbdb876086249e2fb7af908a4 /services/java
parent572b759a41fd490fd21b5831dd8b8434b7fd5df8 (diff)
parent7ccba974175149b2afa1665fbdbd8c4b7c5ccb3c (diff)
Merge "Make SurfaceView layers captured by screenshotApplications()"
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/wm/WindowManagerService.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 9a8e6784dac9..7f571ef9b42d 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -5371,8 +5371,7 @@ public class WindowManagerService extends IWindowManager.Stub
// 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) {
@@ -5397,11 +5396,6 @@ public class WindowManagerService extends IWindowManager.Stub
ws.isDisplayedLw()) {
screenshotReady = true;
}
-
- if (fullscreen) {
- // No point in continuing down through windows.
- break;
- }
}
if (appToken != null && appWin == null) {