diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-02-02 13:22:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-02 13:22:40 -0800 |
| commit | 9ca397f5f06ac4cc970ebba9968794ff75b2c84b (patch) | |
| tree | fd5e1ee42e27afa857b00f3e1bc905479e020f74 /services/java/com/android/server/WindowManagerService.java | |
| parent | adf851755ff8ca50e1023601fff1cb595d86fbc1 (diff) | |
| parent | e40afdf7f44f30d78b0afc96717dae2bb883e3ea (diff) | |
am e40afdf7: am 0035b5ca: Merge "Fix issue #3415137: New wallpaper size breaks thumbnails." into honeycomb
* commit 'e40afdf7f44f30d78b0afc96717dae2bb883e3ea':
Fix issue #3415137: New wallpaper size breaks thumbnails.
Diffstat (limited to 'services/java/com/android/server/WindowManagerService.java')
| -rw-r--r-- | services/java/com/android/server/WindowManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index 17c3154be78e..169c6d87d063 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -5101,6 +5101,9 @@ public class WindowManagerService extends IWindowManager.Stub } Binder.restoreCallingIdentity(ident); + // Constrain frame to the screen size. + frame.intersect(0, 0, dw, dh); + if (frame.isEmpty() || maxLayer == 0) { return null; } |