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

Commit fa11e96a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Load preinstalled sytem font if fs-verity is not supported"

parents 7d0fc352 18c3e398

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -269,6 +269,9 @@ public final class FontManagerService extends IFontManager.Stub { 
        synchronized (mUpdatableFontDirLock) {

        synchronized (mUpdatableFontDirLock) {

            mUpdatableFontDir = createUpdatableFontDir();

            mUpdatableFontDir = createUpdatableFontDir();

            if (mUpdatableFontDir == null) {

            if (mUpdatableFontDir == null) {

                // If fs-verity is not supported, load preinstalled system font map and use it for

                // all apps.

                Typeface.loadPreinstalledSystemFontMap();

                setSerializedFontMap(serializeSystemServerFontMap());

                setSerializedFontMap(serializeSystemServerFontMap());

                return;

                return;

            }

            }