diff options
| author | Craig Mautner <cmautner@google.com> | 2012-05-31 15:35:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-31 15:35:56 -0700 |
| commit | 35c60c944a9350d6240673e157fe06a97fb24180 (patch) | |
| tree | fff68bbd813d749e69ba3e589608d64a65e54a4c | |
| parent | 593b4446fd5cac974b86988cbd03f5a8c1a4862d (diff) | |
| parent | 881656831c9734bfa4a42c56574bbd871c967a3e (diff) | |
| download | frameworks_base-35c60c944a9350d6240673e157fe06a97fb24180.zip frameworks_base-35c60c944a9350d6240673e157fe06a97fb24180.tar.gz frameworks_base-35c60c944a9350d6240673e157fe06a97fb24180.tar.bz2 | |
Merge "Use Surface layer for Surface operation." into jb-dev
| -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 |