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

Commit f16b0aaa authored by Joe Hsu's avatar Joe Hsu Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14514102

Change-Id: Ied1ff5809656343886423c917be965e5ed3b9052
parents ca9330f8 c73c0986

graphics/java/android/graphics/fonts/FontCustomizationParser.java

+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);

        }