From 2bc7087125205863a7e520afbf9e8dc63c3f40e8 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Wed, 22 Aug 2018 10:46:29 -0700 Subject: Fix robolectric test Bug: 112843740 Test: N/A Change-Id: I54663725ace7bbc9b0c3ad582937162e82fec682 --- graphics/java/android/graphics/Typeface.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); -- cgit v1.2.3-59-g8ed1b