am 2624fbca: Fix #2320798: Device hang then runtime restart

Merge commit '2624fbcaaa74b3a6d8d60d22d9e16ef26a98a6b2' into eclair-plus-aosp

* commit '2624fbcaaa74b3a6d8d60d22d9e16ef26a98a6b2':
  Fix #2320798: Device hang then runtime restart
This commit is contained in:
Christopher Tate
2009-12-11 13:05:57 -08:00
committed by Android Git Automerger

View File

@@ -6011,18 +6011,18 @@ public class WindowManagerService extends IWindowManager.Stub
res.offsetLocation(-win.mFrame.left, -win.mFrame.top);
}
}
if (res != null && returnWhat == RETURN_PENDING_POINTER) {
synchronized (mWindowMap) {
if ((mWallpaperTarget == win &&
win.mAttrs.type != WindowManager.LayoutParams.TYPE_KEYGUARD)
|| mSendingPointersToWallpaper) {
sendPointerToWallpaperLocked(win, res, res.getEventTime());
}
}
if (res != null && returnWhat == RETURN_PENDING_POINTER) {
synchronized (mWindowMap) {
if ((mWallpaperTarget == win &&
win.mAttrs.type != WindowManager.LayoutParams.TYPE_KEYGUARD)
|| mSendingPointersToWallpaper) {
sendPointerToWallpaperLocked(win, res, res.getEventTime());
}
}
}
return res;
}