Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Siyamed Sinir
2017-06-19 16:53:11 +00:00
committed by Android (Google) Code Review
parent c885c24e10 532f3c989e
commit 58df6ab93f
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/Editor.java
View File

@@ -2584,15 +2584,19 @@ public class Editor {
if (offset == -1) { if (offset == -1) {
return; return;
} }
stopTextActionModeWithPreservingSelection(); stopTextActionModeWithPreservingSelection();
if (mTextView.canSelectText()) {
final boolean isOnSelection = mTextView.hasSelection() final boolean isOnSelection = mTextView.hasSelection()
&& offset >= mTextView.getSelectionStart() && offset <= mTextView.getSelectionEnd(); && offset >= mTextView.getSelectionStart()
&& offset <= mTextView.getSelectionEnd();
if (!isOnSelection) { if (!isOnSelection) {
// Right clicked position is not on the selection. Remove the selection and move the // Right clicked position is not on the selection. Remove the selection and move the
// cursor to the right clicked position. // cursor to the right clicked position.
Selection.setSelection((Spannable) mTextView.getText(), offset); Selection.setSelection((Spannable) mTextView.getText(), offset);
stopTextActionMode(); stopTextActionMode();
} }
}
if (shouldOfferToShowSuggestions()) { if (shouldOfferToShowSuggestions()) {
final SuggestionInfo[] suggestionInfoArray = final SuggestionInfo[] suggestionInfoArray =