commit c73c098665515f33041d90f0a49b3cdc392e2b13
author Joe Hsu <joehsu@google.com> Thu May 13 01:59:02 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 13 01:59:02 2021 +0000
tree 67ac0f47aa00b613ae0842b2276cb352520ec5e3
parent a9cbf391e0fac9428f241b489e08f28c8acc4060
parent 1681aa2eeb486e105341a5af09bf5af9263ed884

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

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

diff --git a/graphics/java/android/graphics/fonts/FontCustomizationParser.java b/graphics/java/android/graphics/fonts/FontCustomizationParser.java
index 9c01a4b..df47f73 100644
--- a/graphics/java/android/graphics/fonts/FontCustomizationParser.java
+++ b/graphics/java/android/graphics/fonts/FontCustomizationParser.java
@@ -134,7 +134,11 @@
             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);
         }