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

Add a check for misspelled span change.

Browse Source 
Previously, misspelled span is directly used in AddToDicitonary's
OnClickListener. It can crash because misspelled span can have been
updated since SuggestiosPopup is shown.
Also, AddToDictionary didn't work correctly in full screen extracted
mode. Use findEquivalentSuggestionSpan to resolve it.

Bug: 27557526
Change-Id: I51d713dbdd0c44ea2c553164b81b1123a2325aa1
This commit is contained in:
Keisuke Kuroyanagi
2016-03-15 15:40:43 +09:00
parent f8e0da2624
commit 6e0860d959
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3284,10 +3284,18 @@ public class Editor {
com.android.internal.R.id.addToDictionaryButton);
mAddToDictionaryButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
final SuggestionSpan misspelledSpan =
findEquivalentSuggestionSpan(mMisspelledSpanInfo);
if (misspelledSpan == null) {
// Span has been removed.
return;
}
final Editable editable = (Editable) mTextView.getText();
final int spanStart = editable.getSpanStart(
mMisspelledSpanInfo.mSuggestionSpan);
final int spanEnd = editable.getSpanEnd(mMisspelledSpanInfo.mSuggestionSpan);
final int spanStart = editable.getSpanStart(misspelledSpan);
final int spanEnd = editable.getSpanEnd(misspelledSpan);
if (spanStart < 0 || spanEnd <= spanStart) {
return;
}
final String originalText = TextUtils.substring(editable, spanStart, spanEnd);
final Intent intent = new Intent(Settings.ACTION_USER_DICTIONARY_INSERT);