diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-02-02 13:19:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-02 13:19:44 -0800 |
| commit | e40afdf7f44f30d78b0afc96717dae2bb883e3ea (patch) | |
| tree | 5873ccf1c1e6983af5b19931c6af960803f97e09 /services/java/com/android/server/WindowManagerService.java | |
| parent | 746ef9b8f0c080e247c6726b294fa2ab5cf53dac (diff) | |
| parent | 0035b5cad16c0565102105f5cd0222073b0ddf94 (diff) | |
am 0035b5ca: Merge "Fix issue #3415137: New wallpaper size breaks thumbnails." into honeycomb
* commit '0035b5cad16c0565102105f5cd0222073b0ddf94':
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 7a3ef1481714..e1c03d4fe667 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; } |