Merge "Do not load Typefaces twice in system server." (73979a88) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -680,7 +680,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) {