drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 2624fbca to eclair-mr2

Browse Source
This commit is contained in:
Christopher Tate
2009-12-11 13:16:41 -08:00
parent 8eac1637b0 2624fbcaaa
commit af1255dab8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6009,6 +6009,7 @@ public class WindowManagerService extends IWindowManager.Stub
res.offsetLocation(-win.mFrame.left, -win.mFrame.top); res.offsetLocation(-win.mFrame.left, -win.mFrame.top);
} }
} }
}
if (res != null && returnWhat == RETURN_PENDING_POINTER) { if (res != null && returnWhat == RETURN_PENDING_POINTER) {
synchronized (mWindowMap) { synchronized (mWindowMap) {
@ -6019,7 +6020,6 @@ public class WindowManagerService extends IWindowManager.Stub
} }
} }
} }
}
return res; return res;
} }