Merge "Optimization of the request of the sentence level spell check"

1 files changed, 4 insertions, 0 deletions

diff --git a/core/java/android/widget/SpellChecker.java b/core/java/android/widget/SpellChecker.java
index 4f700a2d75b1..9afaee3c786c 100644
--- a/core/java/android/widget/SpellChecker.java
+++ b/core/java/android/widget/SpellChecker.java
@@ -494,6 +494,10 @@ public class SpellChecker implements SpellCheckerSessionListener {
                     editable.removeSpan(mRange);
                     return;
                 }
+                // Stop spell checking when there are no characters in the range.
+                if (wordEnd < start) {
+                    return;
+                }
                 wordStart = regionEnd;
                 // TODO: Find the start position of the sentence.
                 // Set span with the context