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 
am: 58df6ab93f

Change-Id: Icd240aa9e5881067acd7521e4235692c5a538b29
This commit is contained in:
Siyamed Sinir
2017-06-19 17:03:17 +00:00
committed by android-build-merger
parent 1a2133629f 58df6ab93f
commit 04171ecb31
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2584,14 +2584,18 @@ public class Editor {
if (offset == -1) {
return;
}
stopTextActionModeWithPreservingSelection();
final boolean isOnSelection = mTextView.hasSelection()
&& 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 (mTextView.canSelectText()) {
final boolean isOnSelection = mTextView.hasSelection()
&& 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()) {