diff options
| author | Craig Mautner <cmautner@google.com> | 2012-05-31 15:38:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-31 15:38:51 -0700 |
| commit | 41efed0ecc07e1d79ee9112c8f64325fbceab44c (patch) | |
| tree | 88f1b2096eb6fd49041be9ff24cc82a19737348a /services | |
| parent | 359822c586afb667b7ef51a2786cdd33bd4a3942 (diff) | |
| parent | 35c60c944a9350d6240673e157fe06a97fb24180 (diff) | |
| download | frameworks_base-41efed0ecc07e1d79ee9112c8f64325fbceab44c.zip frameworks_base-41efed0ecc07e1d79ee9112c8f64325fbceab44c.tar.gz frameworks_base-41efed0ecc07e1d79ee9112c8f64325fbceab44c.tar.bz2 | |
am 35c60c94: Merge "Use Surface layer for Surface operation." into jb-dev
* commit '35c60c944a9350d6240673e157fe06a97fb24180':
Use Surface layer for Surface operation.
Diffstat (limited to 'services')
| -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 |