commit 56205fea879543a50bb797016832416a8b48cabb
author Android (Google) Code Review <android-gerrit@google.com> Tue Sep 01 11:16:25 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 01 11:16:25 2009 -0700
tree d1159a7bff9c291bd0670196770a011b14197e1a
parent 5126d3a3794c8c5e1e61621daa5e9dab050b44a1
parent a82e99a89b7a12bd86d99d60d23a7a37624499b6

Merge change 23345 into donut

* changes:
  Fix an emoji-measuring bug that caused an exception when editing a contact.

core/java/android/text/Layout.java

diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index 29dc2ea..a92800d 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1527,7 +1527,7 @@
                     if (bm != null) {
                         workPaint.set(paint);
                         Styled.measureText(paint, workPaint, text,
-                                           offset, offset + 1, null);
+                                           j, j + 2, null);
 
                         float wid = (float) bm.getWidth() *
                                     -workPaint.ascent() / bm.getHeight();