Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd7035c58b006b62084232c8db6c4f7c4002170cc':
  Fix a hang in SF caused by invalid transform matrix from the WM
This commit is contained in:
Dave Burke
2011-10-18 22:34:51 -07:00
committed by Android Git Automerger
parent 3c563ce672 d7035c58b0
commit 3254774b92
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/wm/WindowState.java
View File

@@ -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();
}