am 910be3e8: am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb

* commit '910be3e855738eab783f2e280b76dcef90a841ec': Fix TextUtils#commaEllipsize
2011-01-28 14:55:31 -08:00
parent 489c8960b6 910be3e855
commit 4f92dd2a4d
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/text/TextUtils.java
+++ b/core/java/android/text/TextUtils.java
@@ -1142,7 +1142,7 @@ public class TextUtils {

                    // XXX this is probably ok, but need to look at it more
                    tempMt.setPara(format, 0, format.length(), request);
-                    float moreWid = mt.addStyleRun(p, mt.mLen, null);
+                    float moreWid = tempMt.addStyleRun(p, tempMt.mLen, null);

                    if (w + moreWid <= avail) {
                        ok = i + 1;