Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7559e02 authored by Eric Fischer's avatar Eric Fischer Committed by Android Git Automerger
Browse files

am 56205fea: Merge change 23345 into donut 

Merge commit '56205fea' into eclair

* commit '56205fea':
  Fix an emoji-measuring bug that caused an exception when editing a contact.
parents 46c15823 56205fea

core/java/android/text/Layout.java

+1 −1
Original line number Diff line number Diff line
@@ -1527,7 +1527,7 @@ public abstract class Layout { 
                    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();