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

Commit 2cb50d45 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android (Google) Code Review
Browse files

Merge "Layoutlib: Fix FontFamily_Delegate use after unref" into lmp-preview-dev

parents 1a5b0de8 9113968f

tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ public class FontFamily_Delegate { 


    @LayoutlibDelegate

    /*package*/ static void nUnrefFamily(long nativePtr) {

        // Removing the java reference for the object doesn't mean that it's freed for garbage

        // collection. Typeface_Delegate may still hold a reference for it.

        sManager.removeJavaReferenceFor(nativePtr);

    }

tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java

+8 −6
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public final class Typeface_Delegate { 


    // ---- delegate data ----



    private final long[] mFontFamilies;  // the reference to FontFamily_Delegate.

    private final FontFamily_Delegate[] mFontFamilies;  // the reference to FontFamily_Delegate.

    private int mStyle;



    private static long sDefaultTypeface;
@@ -71,8 +71,7 @@ public final class Typeface_Delegate { 


    public List<Font> getFonts(boolean compact) {

        List<Font> fonts = new ArrayList<Font>(mFontFamilies.length);

        for (long fontFamily : mFontFamilies) {

            FontFamily_Delegate ffd = FontFamily_Delegate.getDelegate(fontFamily);

        for (FontFamily_Delegate ffd : mFontFamilies) {

            if (ffd != null) {

                Font font = ffd.getFont(mStyle, compact);

                if (font != null) {
@@ -122,7 +121,11 @@ public final class Typeface_Delegate { 


    @LayoutlibDelegate

    /*package*/ static synchronized long nativeCreateFromArray(long[] familyArray) {

        Typeface_Delegate delegate = new Typeface_Delegate(familyArray, Typeface.NORMAL);

        FontFamily_Delegate[] fontFamilies = new FontFamily_Delegate[familyArray.length];

        for (int i = 0; i < familyArray.length; i++) {

            fontFamilies[i] = FontFamily_Delegate.getDelegate(familyArray[i]);

        }

        Typeface_Delegate delegate = new Typeface_Delegate(fontFamilies, Typeface.NORMAL);

        return sManager.addNewDelegate(delegate);

    }
@@ -153,9 +156,8 @@ public final class Typeface_Delegate { 


    // ---- Private delegate/helper methods ----



    private Typeface_Delegate(long[] fontFamilies, int style) {

    private Typeface_Delegate(FontFamily_Delegate[] fontFamilies, int style) {

        mFontFamilies = fontFamilies;

        mStyle = style;

    }



}