Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0acf2f1 authored by Kohsuke Yatoh's avatar Kohsuke Yatoh
Browse files

Do not load Typefaces twice in system server. 

Zygote should have already loaded them if
ENABLE_LAZY_TYPEFACE_INITIALIZATION is false.

Bug: 172891184
Test: boot
Change-Id: I3c02463b217f31068dc26bf3451cb1d612154230
parent 28f5469e

services/java/com/android/server/SystemServer.java

+3 −1
Original line number Diff line number Diff line
@@ -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()).

            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) {