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

Author: Dave Burke

services/java/com/android/server/wm/WindowState.java

@@ -1120,7 +1120,11 @@ void computeShownFrameLocked() {
                 // 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();
             }