commit 3dbea35f7eaa6d5f94601a48ebb3be18223d4604
author Victoria Lease <violets@google.com> Mon Nov 04 16:23:15 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 04 16:23:15 2013 +0000
tree 471fe724ea88ba3c9f73f219e4848144f73ecfc9
parent cd4919c0325f35a279e17019c9c3c66d80481d30
parent af7dcdf35a37d7a7dbaad7d9869c1c91bce2272b

Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index cb930d6..7a9809f 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -56,6 +56,7 @@
 import android.text.SpanWatcher;
 import android.text.Spannable;
 import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.SpannedString;
 import android.text.StaticLayout;
@@ -3494,19 +3495,7 @@
             ss.selEnd = end;
 
             if (mText instanceof Spanned) {
-                /*
-                 * Calling setText() strips off any ChangeWatchers;
-                 * strip them now to avoid leaking references.
-                 * But do it to a copy so that if there are any
-                 * further changes to the text of this view, it
-                 * won't get into an inconsistent state.
-                 */
-
-                Spannable sp = new SpannableString(mText);
-
-                for (ChangeWatcher cw : sp.getSpans(0, sp.length(), ChangeWatcher.class)) {
-                    sp.removeSpan(cw);
-                }
+                Spannable sp = new SpannableStringBuilder(mText);
 
                 if (mEditor != null) {
                     removeMisspelledSpans(sp);