Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix boot loop issue on Android Wear." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-14 22:16:19 +00:00
committed by Android (Google) Code Review
parent 2ddd69ce1a bf629ed080
commit 5f9fde884b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
graphics/java/android/graphics/Typeface.java
View File

@@ -1135,6 +1135,7 @@ public class Typeface {
// Treat as system error since reaching here means that a system pre-installed font
// can't be used by our font stack.
Log.e(TAG, "Unable to load Family: " + family.getName() + ":" + family.getLanguage());
return null;
}
return fontFamily;
}
@@ -1160,7 +1161,10 @@ public class Typeface {
for (int i = 0; i < fontConfig.getFamilies().length; i++) {
FontConfig.Family f = fontConfig.getFamilies()[i];
if (i == 0 || f.getName() == null) {
familyList.add(makeFamilyFromParsed(f, bufferForPath));
FontFamily family = makeFamilyFromParsed(f, bufferForPath);
if (family != null) {
familyList.add(family);
}
}
}
sFallbackFonts = familyList.toArray(new FontFamily[familyList.size()]);
@@ -1177,6 +1181,9 @@ public class Typeface {
typeface = sDefaultTypeface;
} else {
FontFamily fontFamily = makeFamilyFromParsed(f, bufferForPath);
if (fontFamily == null) {
continue;
}
FontFamily[] families = { fontFamily };
typeface = Typeface.createFromFamiliesWithDefault(families,
RESOLVE_BY_FONT_TABLE, RESOLVE_BY_FONT_TABLE);