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

Commit f0c2d7cd authored by Yeabkal Wubshit's avatar Yeabkal Wubshit Committed by Android (Google) Code Review
Browse files

Merge "Ensure font loaded by PHASE_SYSTEM_SERVICES_READY" into main

parents bebb36cc 4a9e500c

services/core/java/com/android/server/graphics/fonts/FontManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -167,7 +167,8 @@ public final class FontManagerService extends IFontManager.Stub { 
        public void onBootPhase(int phase) {

            final int latestFontLoadBootPhase =

                    (Flags.completeFontLoadInSystemServicesReady())

                            ? SystemService.PHASE_SYSTEM_SERVICES_READY

                            // Complete font load in the phase before PHASE_SYSTEM_SERVICES_READY

                            ? SystemService.PHASE_LOCK_SETTINGS_READY

                            : SystemService.PHASE_ACTIVITY_MANAGER_READY;

            if (phase == latestFontLoadBootPhase) {

                // Wait for FontManagerService to start since it will be needed after this point.