Projects >> android-frameworks-base >>a2aaa9e38f1f491dd2809e36c4f670dd114bc232

Chunk
Conflicting content 
            }

            target.mClient.dispatchPointer(ev, eventTime);
<<<<<<< HEAD

            if (MEASURE_LATENCY) {
                lt.sample("7 after  svr->client ipc ", System.nanoTime() - eventTimeNano);
            }
            return true;
=======
            return INJECT_SUCCEEDED;
>>>>>>> 6edb3487beb1973b1ea05e5b4168ba1ac247c9a4
        } catch (android.os.RemoteException e) {
            Log.i(TAG, "WINDOW DIED during motion dispatch: " + target);
            mKeyWaiter.mMotionTarget = null;
Solution content 
            }

            target.mClient.dispatchPointer(ev, eventTime);

            if (MEASURE_LATENCY) {
                lt.sample("7 after  svr->client ipc ", System.nanoTime() - eventTimeNano);
            }
            return INJECT_SUCCEEDED;
        } catch (android.os.RemoteException e) {
            Log.i(TAG, "WINDOW DIED during motion dispatch: " + target);
            mKeyWaiter.mMotionTarget = null;
File
WindowManagerService.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Return statement