diff options
| author | Craig Mautner <cmautner@google.com> | 2012-05-31 14:25:31 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2012-05-31 14:25:31 -0700 |
| commit | 881656831c9734bfa4a42c56574bbd871c967a3e (patch) | |
| tree | 63adcb9a984b815705de2f804b11e2a7a90d721d | |
| parent | bde32efa209acb47324add8981577af1fa410574 (diff) | |
| download | frameworks_base-881656831c9734bfa4a42c56574bbd871c967a3e.zip frameworks_base-881656831c9734bfa4a42c56574bbd871c967a3e.tar.gz frameworks_base-881656831c9734bfa4a42c56574bbd871c967a3e.tar.bz2 | |
Use Surface layer for Surface operation.
Previous fix exposed an existing bug where we were using mAnimLayer to
determine the highest Surface layer. This fix uses mSurfaceLayer to set
the layer limits for making the screenshot.
Fixes bug 6586168.
Change-Id: Iaa3b43867aef795ca617ff4b8076428dfc91eaf2
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 10919f2..efbf0d4 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -5437,8 +5437,8 @@ public class WindowManagerService extends IWindowManager.Stub // window. including = !ws.mIsImWindow && !ws.isFullscreen(dw, dh); - if (maxLayer < ws.mWinAnimator.mAnimLayer) { - maxLayer = ws.mWinAnimator.mAnimLayer; + if (maxLayer < ws.mWinAnimator.mSurfaceLayer) { + maxLayer = ws.mWinAnimator.mSurfaceLayer; } // Don't include wallpaper in bounds calculation |