Projects >> android-frameworks-base-with-remote-control-service >>e04c14962f4a1089d411e1f7fa4d1019fe723885

Chunk
Conflicting content 
            return superResult;
        }

<<<<<<< HEAD
        if ((mMovement != null || onCheckIsTextEditor()) && isEnabled() &&
                mText instanceof Spannable && mLayout != null) {
            if (hasInsertionController()) {
                getInsertionController().onTouchEvent(event);
            }
            if (hasSelectionController()) {
                getSelectionController().onTouchEvent(event);
            }

=======
        if ((mMovement != null || onCheckIsTextEditor()) && mText instanceof Spannable && mLayout != null) {
>>>>>>> c0728cc042bd5cc6ab520d3395deec50481f8f5a
            boolean handled = false;

            // Save previous selection, in case this event is used to show the IME.
Solution content 
            return superResult;
        }

        if ((mMovement != null || onCheckIsTextEditor()) && isEnabled() &&
                mText instanceof Spannable && mLayout != null) {
            boolean handled = false;

            // Save previous selection, in case this event is used to show the IME.
File
TextView.java
Developer's decision
Combination
Kind of conflict
If statement