diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java index 35d8c41fda8207..622b38773f28b0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java @@ -189,13 +189,11 @@ private static Typeface createAssetTypefaceWithFallbacks( // Iterate over the list of fontFamilyNames, constructing new FontFamily objects // for use in the CustomFallbackBuilder below. for (String fontFamilyName : fontFamilyNames) { - String extension = EXTENSIONS[style]; for (String fileExtension : FILE_EXTENSIONS) { String fileName = new StringBuilder() .append(FONTS_ASSET_PATH) .append(fontFamilyName) - .append(extension) .append(fileExtension) .toString(); try { @@ -212,6 +210,11 @@ private static Typeface createAssetTypefaceWithFallbacks( } } + // If there's some problem constructing fonts, fall back to the default behavior. + if (fontFamilies.size() == 0) { + return createAssetTypeface(fontFamilyNames[0], style, assetManager); + } + Typeface.CustomFallbackBuilder fallbackBuilder = new Typeface.CustomFallbackBuilder(fontFamilies.get(0)); for (int i = 1; i < fontFamilies.size(); i++) { fallbackBuilder.addCustomFallback(fontFamilies.get(i));