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

Commit f58acb9f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use old JNI on robolectric environment" into main

parents 83ea8c88 6970b562

graphics/java/android/graphics/text/PositionedGlyphs.java

+4 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.annotation.NonNull; 
import android.graphics.Paint;

import android.graphics.Typeface;

import android.graphics.fonts.Font;

import android.os.Build;



import com.android.internal.util.Preconditions;

import com.android.text.flags.Flags;
@@ -53,6 +54,8 @@ public final class PositionedGlyphs { 
                        Typeface.class.getClassLoader(), nReleaseFunc());

    }



    private static boolean sIsRobolectric = Build.FINGERPRINT.equals("robolectric");



    private final long mLayoutPtr;

    private final float mXOffset;

    private final float mYOffset;
@@ -252,7 +255,7 @@ public final class PositionedGlyphs { 
        mXOffset = xOffset;

        mYOffset = yOffset;



        if (Flags.typefaceRedesign()) {

        if (!sIsRobolectric && Flags.typefaceRedesign()) {

            int fontCount = nGetFontCount(layoutPtr);

            mFonts = new ArrayList<>(fontCount);

            for (int i = 0; i < fontCount; ++i) {