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

Commit 92d86d59 authored by Siyamed Sinir's avatar Siyamed Sinir Committed by android-build-merger
Browse files

Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev 

am: 58df6ab9

Change-Id: Ic6b3aa97edffd87e643a778d73aa61e890f52a4b
parents 31c2f1e8 58df6ab9

core/java/android/widget/Editor.java

+11 −7
Original line number Diff line number Diff line
@@ -2584,15 +2584,19 @@ public class Editor { 
        if (offset == -1) {

            return;

        }



        stopTextActionModeWithPreservingSelection();

        if (mTextView.canSelectText()) {

            final boolean isOnSelection = mTextView.hasSelection()

                && offset >= mTextView.getSelectionStart() && offset <= mTextView.getSelectionEnd();

                    && offset >= mTextView.getSelectionStart()

                    && offset <= mTextView.getSelectionEnd();

            if (!isOnSelection) {

                // Right clicked position is not on the selection. Remove the selection and move the

                // cursor to the right clicked position.

                Selection.setSelection((Spannable) mTextView.getText(), offset);

                stopTextActionMode();

            }

        }



        if (shouldOfferToShowSuggestions()) {

            final SuggestionInfo[] suggestionInfoArray =