diff options
| -rw-r--r-- | graphics/java/android/graphics/fonts/SystemFonts.java | 16 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java | 4 |
2 files changed, 19 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/fonts/SystemFonts.java b/graphics/java/android/graphics/fonts/SystemFonts.java index 98629a24696a..36bfb98e726b 100644 --- a/graphics/java/android/graphics/fonts/SystemFonts.java +++ b/graphics/java/android/graphics/fonts/SystemFonts.java @@ -235,6 +235,22 @@ public final class SystemFonts { } /** + * Get the updated FontConfig. + * + * @param updatableFontMap a font mapping of updated font files. + * @hide + */ + public static @NonNull FontConfig getSystemFontConfigForTesting( + @NonNull String fontsXml, + @Nullable Map<String, File> updatableFontMap, + long lastModifiedDate, + int configVersion + ) { + return getSystemFontConfigInternal(fontsXml, SYSTEM_FONT_DIR, OEM_XML, OEM_FONT_DIR, + updatableFontMap, lastModifiedDate, configVersion); + } + + /** * Get the system preinstalled FontConfig. * @hide */ diff --git a/services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java b/services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java index e9a7d85ae755..037637630b7a 100644 --- a/services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java +++ b/services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java @@ -67,6 +67,8 @@ import java.util.stream.Collectors; @RunWith(AndroidJUnit4.class) public final class UpdatableFontDirTest { + private static final String LEGACY_FONTS_XML = "/system/etc/fonts.xml"; + /** * A {@link UpdatableFontDir.FontFileParser} for testing. Instead of using real font files, * this test uses fake font files. A fake font file has its PostScript naem and revision as the @@ -140,7 +142,7 @@ public final class UpdatableFontDirTest { private List<File> mPreinstalledFontDirs; private final Supplier<Long> mCurrentTimeSupplier = () -> CURRENT_TIME; private final Function<Map<String, File>, FontConfig> mConfigSupplier = - (map) -> SystemFonts.getSystemFontConfig(map, 0, 0); + (map) -> SystemFonts.getSystemFontConfigForTesting(LEGACY_FONTS_XML, map, 0, 0); private FakeFontFileParser mParser; private FakeFsverityUtil mFakeFsverityUtil; |