diff options
| author | Craig Mautner <cmautner@google.com> | 2013-11-21 18:43:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-21 18:43:43 -0800 |
| commit | 67ed39bbdb17a516508ceb31a414eeecb5623381 (patch) | |
| tree | e445468ade15d1e497ee43cc3bef7b3b669facdb /services/java/com | |
| parent | 1f57ad47b5a0000b47c24f29332b1128d7c6f74f (diff) | |
| parent | 90192a6165f37207fa8ceb15c07aa9582327c294 (diff) | |
| download | frameworks_base-67ed39bbdb17a516508ceb31a414eeecb5623381.zip frameworks_base-67ed39bbdb17a516508ceb31a414eeecb5623381.tar.gz frameworks_base-67ed39bbdb17a516508ceb31a414eeecb5623381.tar.bz2 | |
am 90192a61: am 0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplications()"
* commit '90192a6165f37207fa8ceb15c07aa9582327c294':
Make SurfaceView layers captured by screenshotApplications()
Diffstat (limited to 'services/java/com')
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 8 |
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 3ed5076..f9773a6 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -5595,8 +5595,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) { @@ -5622,11 +5621,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) { |