commit 1fcb6d3ae27ac95388eb036d124bd4bd0c6559cc
author Raph Levien <raph@google.com> Tue Jul 21 16:55:37 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 21 16:55:39 2015 +0000
tree b1278923a9f4e019f09e7484b03f19bffd3cdee0
parent 66e6683193f6a1d071710ea8a39b02f5129fc505
parent ea2b4a40f7236172398ebcaa273612e00340d847

Merge "Respect style boundaries when measuring text" into mnc-dev

core/java/android/text/TextLine.java

diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java
index 605b91d..39e8694 100644
--- a/core/java/android/text/TextLine.java
+++ b/core/java/android/text/TextLine.java
@@ -741,11 +741,11 @@
 
         if (needWidth || (c != null && (wp.bgColor != 0 || wp.underlineColor != 0 || runIsRtl))) {
             if (mCharsValid) {
-                ret = wp.getRunAdvance(mChars, start, contextEnd, contextStart, contextEnd,
+                ret = wp.getRunAdvance(mChars, start, end, contextStart, contextEnd,
                         runIsRtl, end);
             } else {
                 int delta = mStart;
-                ret = wp.getRunAdvance(mText, delta + start, delta + contextEnd,
+                ret = wp.getRunAdvance(mText, delta + start, delta + end,
                         delta + contextStart, delta + contextEnd, runIsRtl, delta + end);
             }
         }