Merge "Reuse computed font mapping for preinstalled system font config." into sc-dev

2021-02-04 20:47:34 +00:00
parent 3d34f830cb 5f03d0dc69
commit 6844416a52
1 changed files with 7 additions and 1 deletions
--- a/services/core/java/com/android/server/graphics/fonts/FontManagerService.java
+++ b/services/core/java/com/android/server/graphics/fonts/FontManagerService.java
@@ -219,7 +219,13 @@ public final class FontManagerService extends IFontManager.Stub {
    private void initialize() {
        synchronized (mUpdatableFontDirLock) {
            if (mUpdatableFontDir == null) {
-                updateSerializedFontMap();
+                synchronized (mSerializedFontMapLock) {
+                    try {
+                        mSerializedFontMap = Typeface.serializeFontMap(Typeface.getSystemFontMap());
+                    } catch (IOException | ErrnoException e) {
+                        mSerializedFontMap = null;
+                    }
+                }
                return;
            }
            if (mFontCrashDetector.hasCrashed()) {