From e022085160750ad79c1d3b98ace89b22047db13d Mon Sep 17 00:00:00 2001
From: Jerome Gaillard <jgaillard@google.com>
Date: Wed, 3 Apr 2019 13:31:41 +0100
Subject: Dispose Typeface cache only if Typeface was initialized

Bug: 74062470
Test: tested from Studio
Change-Id: I049c982b977ab5d7d6c69f0f341f1c15b3aa2219
---
 bridge/src/com/android/layoutlib/bridge/Bridge.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bridge/src/com/android/layoutlib/bridge/Bridge.java b/bridge/src/com/android/layoutlib/bridge/Bridge.java
index 70ccdb6167..4072bf3df1 100644
--- a/bridge/src/com/android/layoutlib/bridge/Bridge.java
+++ b/bridge/src/com/android/layoutlib/bridge/Bridge.java
@@ -361,7 +361,9 @@ public final class Bridge extends com.android.ide.common.rendering.api.Bridge {
         BridgeAssetManager.clearSystem();
 
         // dispose of the default typeface.
-        Typeface.sDynamicTypefaceCache.evictAll();
+        if (sIsTypefaceInitialized) {
+            Typeface.sDynamicTypefaceCache.evictAll();
+        }
         sProject9PatchCache.clear();
         sProjectBitmapCache.clear();
 
-- 
cgit v1.2.3