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

Commit 8bd41ac1 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix typo in manual merge" into gingerbread-plus-aosp

parents f8c24a66 dd11387e

core/java/android/widget/TextView.java

+1 −1
Original line number Diff line number Diff line
@@ -6847,7 +6847,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            return superResult;

        }



        if ((mMovement != null || onCheckIsTextEditor()) && isEnabled()

        if ((mMovement != null || onCheckIsTextEditor()) && isEnabled() &&

                mText instanceof Spannable && mLayout != null) {

            if (hasInsertionController()) {

                getInsertionController().onTouchEvent(event);