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

Do not load Typefaces twice in system server.

Browse Source 
Zygote should have already loaded them if
ENABLE_LAZY_TYPEFACE_INITIALIZATION is false.

Bug: 172891184
Test: boot
Change-Id: I3c02463b217f31068dc26bf3451cb1d612154230
This commit is contained in:
Kohsuke Yatoh
2020-12-10 15:24:21 -08:00
parent 28f5469e44
commit f0acf2f128
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/SystemServer.java
View File

@@ -678,7 +678,9 @@ public final class SystemServer implements Dumpable {
// Load preinstalled system fonts for system server, so that WindowManagerService, etc
// can start using Typeface. Note that fonts are required not only for text rendering,
// but also for some text operations (e.g. TextUtils.makeSafeForPresentation()).
Typeface.loadPreinstalledSystemFontMap();
if (Typeface.ENABLE_LAZY_TYPEFACE_INITIALIZATION) {
Typeface.loadPreinstalledSystemFontMap();
}
// Attach JVMTI agent if this is a debuggable build and the system property is set.
if (Build.IS_DEBUGGABLE) {