Projects >> platform_frameworks_base >>af1255dab8fa3eab1caf9bae799f80de14a74470

Chunk
Conflicting content 
                        res.offsetLocation(-win.mFrame.left, -win.mFrame.top);
                    }
                }
<<<<<<< HEAD

                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());
>>>>>>> 2624fbcaaa74b3a6d8d60d22d9e16ef26a98a6b2
                    }
                }
            }
Solution content 
                        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());
                    }
                }
            }
File
WindowManagerService.java
Developer's decision
Version 2
Kind of conflict
If statement
Synchronized statement