diff --git a/core/java/android/service/textservice/SpellCheckerService.java b/core/java/android/service/textservice/SpellCheckerService.java
index acfef8251d068..120a37a06958c 100644
--- a/core/java/android/service/textservice/SpellCheckerService.java
+++ b/core/java/android/service/textservice/SpellCheckerService.java
@@ -383,8 +383,9 @@ public abstract class SpellCheckerService extends Service {
             while (wordStart <= end && wordEnd != BreakIterator.DONE
                     && wordStart != BreakIterator.DONE) {
                 if (wordEnd >= start && wordEnd > wordStart) {
-                    final String query = originalText.subSequence(wordStart, wordEnd).toString();
-                    final TextInfo ti = new TextInfo(query, cookie, query.hashCode());
+                    final CharSequence query = originalText.subSequence(wordStart, wordEnd);
+                    final TextInfo ti = new TextInfo(query, 0, query.length(), cookie,
+                            query.hashCode());
                     wordItems.add(new SentenceWordItem(ti, wordStart, wordEnd));
                     if (DBG) {
                         Log.d(TAG, "Adapter: word (" + (wordItems.size() - 1) + ") " + query);