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

Commit 6970b562 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Use old JNI on robolectric environment 

Bug: 361260253
Test: N/A
Flag: com.android.text.flags.typeface_redesign
Change-Id: I3b78b4400785438e09b3882d106d22e4bba5cf49
parent 3b204907

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) {