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

1 files changed, 5 insertions, 1 deletions

diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java
index e9218181ab87..eeffb028c0cd 100644
--- 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();
             }