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

2021-05-13 01:59:02 +00:00
parent a9cbf391e0 1681aa2eeb
commit c73c098665
1 changed files with 5 additions and 1 deletions
--- a/graphics/java/android/graphics/fonts/FontCustomizationParser.java
+++ b/graphics/java/android/graphics/fonts/FontCustomizationParser.java
@@ -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);
        }