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

Commit 132a74b0 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by android-build-merger
Browse files

Merge "Fix: doRunAdvance returns wrong value when offset == count." into nyc-dev am: aea43f84 

am: 5c7f79fc

* commit '5c7f79fc':
  Fix: doRunAdvance returns wrong value when offset == count.

Change-Id: I6a165a53f81533931dbd64330705a05b68d2852f
parents c2844f78 5c7f79fc

core/jni/android/graphics/Paint.cpp

+1 −1
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ namespace PaintGlue { 
    static jfloat doRunAdvance(const Paint* paint, Typeface* 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);

        }