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

Commit b32d0f23 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android Git Automerger
Browse files

am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread 

Merge commit 'e2978c8d' into gingerbread-plus-aosp

* commit 'e2978c8d':
  Fix for an NPE in TextView.
parents 6cf1a8bf e2978c8d

core/java/android/widget/TextView.java

+6 −4
Original line number Diff line number Diff line
@@ -6474,10 +6474,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            if (!mFrozenWithFocus || (selStart < 0 || selEnd < 0)) {

                boolean selMoved = mSelectionMoved;



                if (mSelectionModifierCursorController != null) {

                    final int touchOffset = 

                        ((SelectionModifierCursorController) mSelectionModifierCursorController).

                        getMinTouchOffset();

                    Selection.setSelection((Spannable) mText, touchOffset);

                }



                if (mMovement != null) {

                    mMovement.onTakeFocus(this, (Spannable) mText, direction);