summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/java/android/graphics/Typeface.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java
index 7fa748461c2d..52806423c336 100644
--- a/graphics/java/android/graphics/Typeface.java
+++ b/graphics/java/android/graphics/Typeface.java
@@ -1008,7 +1008,10 @@ public class Typeface {
SystemFonts.getAliases());
sSystemFontMap = Collections.unmodifiableMap(systemFontMap);
- setDefault(sSystemFontMap.get(DEFAULT_FAMILY));
+ // We can't assume DEFAULT_FAMILY available on Roboletric.
+ if (sSystemFontMap.containsKey(DEFAULT_FAMILY)) {
+ setDefault(sSystemFontMap.get(DEFAULT_FAMILY));
+ }
// Set up defaults and typefaces exposed in public API
DEFAULT = create((String) null, 0);