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

Commit 575586af authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Suppress exception of family creation during device boot 

Bug: 416442797
Test: N/A
Flag: EXEMPT bugfix
Change-Id: I521d50489d83d11e1a3f271564c2e8286578dda0
parent 8fbbf6f9

graphics/java/android/graphics/fonts/SystemFonts.java

+18 −2
Original line number Original line Diff line number Diff line
@@ -292,8 +292,24 @@ public final class SystemFonts { 
                b.addFont(font);

                b.addFont(font);

            }

            }

        }

        }

        return b == null ? null : b.build(languageTags, variant, false /* isCustomFallback */,

        if (b == null) {

            return null;

        }



        try {

            return b.build(languageTags, variant, false /* isCustomFallback */,

                    isDefaultFallback, varFamilyType);

                    isDefaultFallback, varFamilyType);

        } catch (Exception e) {

            StringBuilder sb = new StringBuilder();

            for (int i = 0; i < fonts.size(); ++i) {

                if (i != 0) {

                    sb.append(",");

                }

                sb.append(fonts.get(i));

            }

            Log.e(TAG, "Failed during creating FontFamily, possibly invalid font format: " + sb);

        }

        return null;

    }

    }





    private static void appendNamedFamilyList(@NonNull FontConfig.NamedFamilyList namedFamilyList,

    private static void appendNamedFamilyList(@NonNull FontConfig.NamedFamilyList namedFamilyList,