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

am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2

Browse Source 
Merge commit 'af1255dab8fa3eab1caf9bae799f80de14a74470' into eclair-mr2-plus-aosp

* commit 'af1255dab8fa3eab1caf9bae799f80de14a74470':
  Fix #2320798: Device hang then runtime restart
This commit is contained in:
Christopher Tate
2009-12-11 13:20:15 -08:00
committed by Android Git Automerger
parent e86a37c6bf af1255dab8
commit 09f82ec61c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/java/com/android/server/WindowManagerService.java
View File

@@ -6009,14 +6009,14 @@ 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());
}
}
}