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

Avoid loading system font map twice.

Browse Source 
In ag/23835644, pre-installed system font maps are loaded if
mUpdatableFontDir==null, so there's no need to set system font map again
at the end of the constructor.

Bug: 290301535
Test: presubmit
Change-Id: I820e8433e309e2a706f9f32798a1b0c79b36c8ee
This commit is contained in:
Yeabkal Wubshit
2023-07-07 03:36:40 +00:00
parent c41e070125
commit 90b6f04920
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");
}
}
}