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

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

Merge "Rollback 'Use old JNI on robolectric environment'." into main

parents 0ad87f91 3517fbbf

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

+1 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 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;
@@ -54,8 +53,6 @@ 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;
@@ -255,7 +252,7 @@ public final class PositionedGlyphs { 
        mXOffset = xOffset;

        mYOffset = yOffset;



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

        if (Flags.typefaceRedesign()) {

            int fontCount = nGetFontCount(layoutPtr);

            mFonts = new ArrayList<>(fontCount);

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