Merge "Fix a bug in sentence detection when input is too long." into sc-dev

1 files changed, 2 insertions, 2 deletions

diff --git a/core/java/android/widget/SpellChecker.java b/core/java/android/widget/SpellChecker.java
index 2f7b85e2ab9b..6b3a698f118d 100644
--- a/core/java/android/widget/SpellChecker.java
+++ b/core/java/android/widget/SpellChecker.java
@@ -827,7 +827,7 @@ public class SpellChecker implements SpellCheckerSessionListener {
             // The offset should be rounded up to word boundary.
             int uncheckedLength = sentenceEnd - textChangeStart;
             if (uncheckedLength > MAX_SENTENCE_LENGTH) {
-                sentenceEnd = findSeparator(sequence, sentenceStart + MAX_SENTENCE_LENGTH,
+                sentenceEnd = findSeparator(sequence, textChangeStart + MAX_SENTENCE_LENGTH,
                         sentenceEnd);
                 sentenceStart = roundUpToWordStart(sequence, textChangeStart, sentenceStart);
             } else {
@@ -835,7 +835,7 @@ public class SpellChecker implements SpellCheckerSessionListener {
                         sentenceStart);
             }
         }
-        return new Range(sentenceStart, sentenceEnd);
+        return new Range<>(sentenceStart, Math.max(sentenceStart, sentenceEnd));
     }
 
     private int roundUpToWordStart(CharSequence sequence, int position, int frontBoundary) {