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

Commit ffae6c7f authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Fix NPE and wrong behavior of Typeface.isSupportedAxes 

The Typeface kept by Paint object can be null if nobody calls
setTypeface. The null typeface is equivalent to the Typeface.DEFAULT.
To check whether the passed axis is usable for Typeface.DEFAULT, we
need to pass Typeface.DEFAULT to isSupportedAxes if no typeface was set
on the Paint.

At the same time this CL fixes an issue in isSupportedAxes.
If the requested axis is listed in the first element of axes list,
isSupportedAxes returned false due to wrong handling of binarySearch
result.

Bug: 62146672
Bug: 62147012
Test: am instrument -w -e class android.graphics.cts.PaintTest
android.graphics.cts/android.support.test.runner.AndroidJUnitRunner

Change-Id: I7c154adfe8a19d6ed24ad645df7c10cee7880461
parent dc23c5e8

graphics/java/android/graphics/Paint.java

+5 −2
Original line number Diff line number Diff line
@@ -1594,10 +1594,13 @@ public class Paint { 
            return true;

        }



        // The null typeface is valid and it is equivalent to Typeface.DEFAULT.

        // To call isSupportedAxes method, use Typeface.DEFAULT instance.

        Typeface targetTypeface = mTypeface == null ? Typeface.DEFAULT : mTypeface;

        FontVariationAxis[] axes = FontVariationAxis.fromFontVariationSettings(settings);

        final ArrayList<FontVariationAxis> filteredAxes = new ArrayList<FontVariationAxis>();

        for (final FontVariationAxis axis : axes) {

            if (mTypeface.isSupportedAxes(axis.getOpenTypeTagValue())) {

            if (targetTypeface.isSupportedAxes(axis.getOpenTypeTagValue())) {

                filteredAxes.add(axis);

            }

        }
@@ -1605,7 +1608,7 @@ public class Paint { 
            return false;

        }

        mFontVariationSettings = settings;

        setTypeface(Typeface.createFromTypefaceWithVariation(mTypeface, filteredAxes));

        setTypeface(Typeface.createFromTypefaceWithVariation(targetTypeface, filteredAxes));

        return true;

    }

graphics/java/android/graphics/Typeface.java

+3 −3
Original line number Diff line number Diff line
@@ -725,8 +725,8 @@ public class Typeface { 
    }



    /** @hide */

    public static Typeface createFromTypefaceWithVariation(Typeface family,

            List<FontVariationAxis> axes) {

    public static Typeface createFromTypefaceWithVariation(@Nullable Typeface family,

            @NonNull List<FontVariationAxis> axes) {

        final long ni = family == null ? 0 : family.native_instance;

        return new Typeface(nativeCreateFromTypefaceWithVariation(ni, axes));

    }
@@ -1056,7 +1056,7 @@ public class Typeface { 
                }

            }

        }

        return Arrays.binarySearch(mSupportedAxes, axis) > 0;

        return Arrays.binarySearch(mSupportedAxes, axis) >= 0;

    }



    private static native long nativeCreateFromTypeface(long native_instance, int style);