diff options
| author | 2018-08-22 10:46:29 -0700 | |
|---|---|---|
| committer | 2018-08-22 10:46:29 -0700 | |
| commit | 2bc7087125205863a7e520afbf9e8dc63c3f40e8 (patch) | |
| tree | 25ebafe59aa5ae4035b8518bdc0c31323d94b922 | |
| parent | b3d3dd2173cb0d292f3daffd6755705e39890c6c (diff) | |
Fix robolectric test
Bug: 112843740
Test: N/A
Change-Id: I54663725ace7bbc9b0c3ad582937162e82fec682
| -rw-r--r-- | graphics/java/android/graphics/Typeface.java | 5 |
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); |