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

Commit 630fce52 authored by Qi Wang's avatar Qi Wang Committed by Automerger Merge Worker
Browse files

Merge "Validate spell checker suggestions before applying." into sc-dev am: 0ebb4d88 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14305127

Change-Id: If179741ff15268b771de5404b3cff5702151b0ac
parents 0d49f322 0ebb4d88

core/java/android/widget/SpellChecker.java

+4 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ public class SpellChecker implements SpellCheckerSessionListener { 
    @Override

    public void onGetSentenceSuggestions(SentenceSuggestionsInfo[] results) {

        final Editable editable = (Editable) mTextView.getText();



        final int sentenceLength = editable.length();

        for (int i = 0; i < results.length; ++i) {

            final SentenceSuggestionsInfo ssi = results[i];

            if (ssi == null) {
@@ -475,6 +475,9 @@ public class SpellChecker implements SpellCheckerSessionListener { 
                }

                final int offset = ssi.getOffsetAt(j);

                final int length = ssi.getLengthAt(j);

                if (offset < 0 || offset + length > sentenceLength) {

                    continue;

                }

                final SpellCheckSpan scs = onGetSuggestionsInternal(

                        suggestionsInfo, offset, length);

                if (spellCheckSpan == null && scs != null) {