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

Commit f0a302f1 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by android-build-merger
Browse files

Merge "Fills font metrics before passing to ReplacementSpan" into pi-dev 

am: 13814842

Change-Id: I25a8114a246c7c0a244e2ee69f9efd58b5dbd6f9
parents 469a4ce1 13814842

core/java/android/text/MeasuredParagraph.java

+4 −3
Original line number Diff line number Diff line
@@ -540,9 +540,6 @@ public class MeasuredParagraph { 
    private void applyStyleRun(@IntRange(from = 0) int start,  // inclusive, in copied buffer

                               @IntRange(from = 0) int end,  // exclusive, in copied buffer

                               /* Maybe Zero */ long nativeBuilderPtr) {

        if (nativeBuilderPtr != 0) {

            mCachedPaint.getFontMetricsInt(mCachedFm);

        }



        if (mLtrWithoutBidi) {

            // If the whole text is LTR direction, just apply whole region.
@@ -614,6 +611,10 @@ public class MeasuredParagraph { 
        final int startInCopiedBuffer = start - mTextStart;

        final int endInCopiedBuffer = end - mTextStart;



        if (nativeBuilderPtr != 0) {

            mCachedPaint.getFontMetricsInt(mCachedFm);

        }



        if (replacement != null) {

            applyReplacementRun(replacement, startInCopiedBuffer, endInCopiedBuffer,

                                nativeBuilderPtr);