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

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

Merge "Avoid loading system font map twice." into main

parents afed24e2 90b6f049
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -228,12 +228,17 @@ public final class FontManagerService extends IFontManager.Stub {
        mIsSafeMode = safeMode;
        initialize();

        // 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");
            }
        }
    }

    @Nullable
    private UpdatableFontDir createUpdatableFontDir() {