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

Commit c73c0986 authored by Joe Hsu's avatar Joe Hsu Committed by Android (Google) Code Review
Browse files

Merge "Check FontFamily null before adding it." into sc-dev

parents a9cbf391 1681aa2e
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -134,7 +134,11 @@ public class FontCustomizationParser {
            throw new IllegalArgumentException("customizationType must be specified");
        }
        if (customizationType.equals("new-named-family")) {
            out.add(FontListParser.readFamily(parser, fontDir, updatableFontMap, false));
            FontFamily fontFamily = FontListParser.readFamily(
                    parser, fontDir, updatableFontMap, false);
            if (fontFamily != null) {
                out.add(fontFamily);
            }
        } else {
            throw new IllegalArgumentException("Unknown customizationType=" + customizationType);
        }