commit b3677715e64277fb59045684a7722ef8a8ab2541
author Keisuke Kuroyanagi <ksk@google.com> Mon Mar 28 19:16:30 2016 +0900
committer Keisuke Kuroyanagi <ksk@google.com> Mon Mar 28 19:16:30 2016 +0900
tree fac20343a78ab8b860817ba0402c261878dee649
parent f0bb87b7c40efeeaee58d4c7b767961c9800463e

Fix: doRunAdvance returns wrong value when offset == count.

Bug: 27869952
Change-Id: I56278676da4c354ced4244e4b073bb0d82edf93b

core/jni/android/graphics/Paint.cpp

diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp
index d00e94c..f00f0bf 100644
--- a/core/jni/android/graphics/Paint.cpp
+++ b/core/jni/android/graphics/Paint.cpp
@@ -823,7 +823,7 @@
     static jfloat doRunAdvance(const Paint* paint, TypefaceImpl* typeface, const jchar buf[],
             jint start, jint count, jint bufSize, jboolean isRtl, jint offset) {
         int bidiFlags = isRtl ? kBidi_Force_RTL : kBidi_Force_LTR;
-        if (offset == count) {
+        if (offset == start + count) {
             return MinikinUtils::measureText(paint, bidiFlags, typeface, buf, start, count,
                     bufSize, nullptr);
         }