commit e7178efb3ecd791282f16859885f10c0daeb5a81
author Jerome Gaillard <jgaillard@google.com> Wed Apr 10 13:09:05 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 10 13:09:05 2019 +0000
tree 4c022be9420b5c76bcd8edbd7242c590e7df4e2a
parent 45c0897683cea66c544c2562c883cbc3bf41effb
parent e022085160750ad79c1d3b98ace89b22047db13d

Merge "Dispose Typeface cache only if Typeface was initialized" into qt-dev

bridge/src/com/android/layoutlib/bridge/Bridge.java

diff --git a/bridge/src/com/android/layoutlib/bridge/Bridge.java b/bridge/src/com/android/layoutlib/bridge/Bridge.java
index 70ccdb6..4072bf3 100644
--- a/bridge/src/com/android/layoutlib/bridge/Bridge.java
+++ b/bridge/src/com/android/layoutlib/bridge/Bridge.java
@@ -361,7 +361,9 @@
         BridgeAssetManager.clearSystem();
 
         // dispose of the default typeface.
-        Typeface.sDynamicTypefaceCache.evictAll();
+        if (sIsTypefaceInitialized) {
+            Typeface.sDynamicTypefaceCache.evictAll();
+        }
         sProject9PatchCache.clear();
         sProjectBitmapCache.clear();