Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af1255da authored by Christopher Tate's avatar Christopher Tate
Browse files

resolved conflicts for merge of 2624fbca to eclair-mr2

parents 8eac1637 2624fbca

services/java/com/android/server/WindowManagerService.java

+7 −7
Original line number Diff line number Diff line
@@ -6009,6 +6009,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                        res.offsetLocation(-win.mFrame.left, -win.mFrame.top);

                    }

                }

            }



            if (res != null && returnWhat == RETURN_PENDING_POINTER) {

                synchronized (mWindowMap) {
@@ -6019,7 +6020,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                    }

                }

            }

            }



            return res;

        }