Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid loading system font map twice." into main

Browse Source
This commit is contained in:
Yeabkal Wubshit
2023-07-07 06:45:14 +00:00
committed by Android (Google) Code Review
parent afed24e208 90b6f04920
commit 3451fd4e5f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/graphics/fonts/FontManagerService.java
View File

@@ -228,10 +228,15 @@ public final class FontManagerService extends IFontManager.Stub {
mIsSafeMode = safeMode;
initialize();
try {
Typeface.setSystemFontMap(getCurrentFontMap());
} catch (IOException | ErrnoException e) {
Slog.w(TAG, "Failed to set system font map of system_server");
// Set system font map only if there is updatable font directory.
// If there is no updatable font directory, `initialize` will have already loaded the
// system font map, so there's no need to set the system font map again here.
if (mUpdatableFontDir != null) {
try {
Typeface.setSystemFontMap(getCurrentFontMap());
} catch (IOException | ErrnoException e) {
Slog.w(TAG, "Failed to set system font map of system_server");
}
}
}