commit ae2275abf39f8eea243ca2535f98dde3efaf670a
author android-build-team Robot <android-build-team-robot@google.com> Thu Apr 11 03:04:22 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Apr 11 03:04:22 2019 +0000
tree 4c022be9420b5c76bcd8edbd7242c590e7df4e2a
parent 9243a653eefa277964a6728d81d23861d875e0c7
parent e7178efb3ecd791282f16859885f10c0daeb5a81

Snap for 5457264 from e7178efb3ecd791282f16859885f10c0daeb5a81 to qt-release

Change-Id: I396d07cff885e4b4b08dcdc42f9f0bfd41f6ce61

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();