Projects >> platform_frameworks_base >>9380abe619c056a72b626db071a37af463e6b794

Chunk
Conflicting content 
                    return deliverPointerEvent(q);
                } else if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) {
                    return deliverTrackballEvent(q);
<<<<<<< HEAD
                } else {
                    return deliverGenericMotionEvent(q);
=======
                } else {
                    return deliverGenericMotionEvent(q);
                }
            }
        } finally {
            Trace.traceEnd(Trace.TRACE_TAG_VIEW);
        }
    }

    private int deliverInputEventPostIme(QueuedInputEvent q) {
        Trace.traceBegin(Trace.TRACE_TAG_VIEW, "deliverInputEventPostIme");
        try {
            if (q.mEvent instanceof KeyEvent) {
                return deliverKeyEventPostIme(q);
            } else {
                final int source = q.mEvent.getSource();
                if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) {
                    return deliverTrackballEventPostIme(q);
                } else {
                    return deliverGenericMotionEventPostIme(q);
>>>>>>> 31ea5707fa4f258533a869d58ef6f9f50cd99c65
                }
            }
        } finally {
Solution content 
                    return deliverPointerEvent(q);
                } else if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) {
                    return deliverTrackballEvent(q);
                } else {
                    return deliverGenericMotionEvent(q);
                }
            }
        } finally {
File
ViewRootImpl.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Method signature
Return statement
Try statement
Variable
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    private int deliverInputEventPostIme(QueuedInputEvent q) {
        Trace.traceBegin(Trace.TRACE_TAG_VIEW, "deliverInputEventPostIme");
        try {
            if (q.mEvent instanceof KeyEvent) {
                return deliverKeyEventPostIme(q);
            } else {
                final int source = q.mEvent.getSource();
                if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) {
                    return deliverTrackballEventPostIme(q);
                } else {
                    return deliverGenericMotionEventPostIme(q);
                }
            }
        } finally {
            Trace.traceEnd(Trace.TRACE_TAG_VIEW);
        }
    }

=======
>>>>>>> 31ea5707fa4f258533a869d58ef6f9f50cd99c65
    private int deliverPointerEvent(QueuedInputEvent q) {
        final MotionEvent event = (MotionEvent)q.mEvent;
        final boolean isTouchEvent = event.isTouchEvent();
Solution content 
        }
    }

    private int deliverInputEventPostIme(QueuedInputEvent q) {
        Trace.traceBegin(Trace.TRACE_TAG_VIEW, "deliverInputEventPostIme");
        try {
            if (q.mEvent instanceof KeyEvent) {
                return deliverKeyEventPostIme(q);
            } else {
                final int source = q.mEvent.getSource();
                if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) {
                    return deliverTrackballEventPostIme(q);
                } else {
                    return deliverGenericMotionEventPostIme(q);
                }
            }
        } finally {
            Trace.traceEnd(Trace.TRACE_TAG_VIEW);
        }
    }

    private int deliverPointerEvent(QueuedInputEvent q) {
        final MotionEvent event = (MotionEvent)q.mEvent;
        final boolean isTouchEvent = event.isTouchEvent();
File
ViewRootImpl.java
Developer's decision
Version 1
Kind of conflict
Method declaration