Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0

2011-10-18 22:33:40 -07:00
parent 5264f6003b 526f0a0e15
commit d7035c58b0
1 changed files with 5 additions and 1 deletions
--- a/services/java/com/android/server/wm/WindowState.java
+++ b/services/java/com/android/server/wm/WindowState.java
@@ -1120,7 +1120,11 @@ final class WindowState implements WindowManagerPolicy.WindowState {
                // window's center).
                final float w = frame.width();
                final float h = frame.height();
-                tmpMatrix.setScale(1 + 2/w, 1 + 2/h, w/2, h/2);
+                if (w>=1 && h>=1) {
+                    tmpMatrix.setScale(1 + 2/w, 1 + 2/h, w/2, h/2);
+                } else {
+                    tmpMatrix.reset();
+                }
            } else {
                tmpMatrix.reset();
            }