Merge "Use TextUtils.substring instead of String.substring."
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 010cb27..15353bb 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -3023,7 +3023,7 @@
                 return;
             }
 
-            final String originalText = editable.toString().substring(spanStart, spanEnd);
+            final String originalText = TextUtils.substring(editable, spanStart, spanEnd);
 
             if (suggestionInfo.suggestionIndex == ADD_TO_DICTIONARY) {
                 Intent intent = new Intent(Settings.ACTION_USER_DICTIONARY_INSERT);