am 0035b5ca: Merge "Fix issue #3415137: New wallpaper size breaks thumbnails." into honeycomb

* commit '0035b5cad16c0565102105f5cd0222073b0ddf94': Fix issue #3415137: New wallpaper size breaks thumbnails.
2011-02-02 13:19:44 -08:00
parent 746ef9b8f0 0035b5cad1
commit e40afdf7f4
1 changed files with 3 additions and 0 deletions
--- 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;
            }