1 files changed, 18 insertions, 0 deletions
diff --git a/tests/FontMgrAndroidParserTest.cpp b/tests/FontMgrAndroidParserTest.cpp
index b5346ef5b6..cd10d04dc6 100644
--- a/tests/FontMgrAndroidParserTest.cpp
+++ b/tests/FontMgrAndroidParserTest.cpp
@@ -8,7 +8,9 @@
 #include "Resources.h"
 #include "SkCommandLineFlags.h"
 #include "SkFixed.h"
+#include "SkFontMgr_android.h"
 #include "SkFontMgr_android_parser.h"
+#include "SkTypeface.h"
 #include "Test.h"
 
 #include <cmath>
@@ -220,3 +222,19 @@ DEF_TEST(FontMgrAndroidParser, reporter) {
         SkDebugf("---- Resource files missing for FontConfigParser test\n");
     }
 }
+
+DEF_TEST(FontMgrAndroidLegacyMakeTypeface, reporter) {
+    SkString basePath = GetResourcePath("fonts/");
+    SkString fontsXml = GetResourcePath("fonts/fonts.xml");
+
+    SkFontMgr_Android_CustomFonts custom;
+    custom.fSystemFontUse = SkFontMgr_Android_CustomFonts::kOnlyCustom;
+    custom.fBasePath = basePath.c_str();
+    custom.fFontsXml = fontsXml.c_str();
+    custom.fFallbackFontsXml = nullptr;
+    custom.fIsolated = false;
+
+    sk_sp<SkFontMgr> fm(SkFontMgr_New_Android(&custom));
+    sk_sp<SkTypeface> t(fm->legacyMakeTypeface("non-existent-font", SkFontStyle()));
+    REPORTER_ASSERT(reporter, nullptr == t);
+}