Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clear PersistentSystemFontConfig before update." into sc-dev

Browse Source
This commit is contained in:
Kohsuke Yatoh
2021-04-13 20:09:13 +00:00
committed by Android (Google) Code Review
parent c7c816a951 474377182b
commit bceed6d6ba
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java
View File

@@ -261,15 +261,15 @@ final class UpdatableFontDir {
// Write config file. // Write config file.
mLastModifiedMillis = mCurrentTimeSupplier.get(); mLastModifiedMillis = mCurrentTimeSupplier.get();
curConfig.lastModifiedMillis = mLastModifiedMillis; PersistentSystemFontConfig.Config newConfig = new PersistentSystemFontConfig.Config();
newConfig.lastModifiedMillis = mLastModifiedMillis;
for (FontFileInfo info : mFontFileInfoMap.values()) { for (FontFileInfo info : mFontFileInfoMap.values()) {
curConfig.updatedFontDirs.add(info.getRandomizedFontDir().getName()); newConfig.updatedFontDirs.add(info.getRandomizedFontDir().getName());
} }
curConfig.fontFamilies.clear(); newConfig.fontFamilies.addAll(familyMap.values());
curConfig.fontFamilies.addAll(familyMap.values());
try (FileOutputStream fos = new FileOutputStream(mTmpConfigFile)) { try (FileOutputStream fos = new FileOutputStream(mTmpConfigFile)) {
PersistentSystemFontConfig.writeToXml(fos, curConfig); PersistentSystemFontConfig.writeToXml(fos, newConfig);
} catch (Exception e) { } catch (Exception e) {
throw new SystemFontException( throw new SystemFontException(
FontManager.RESULT_ERROR_FAILED_UPDATE_CONFIG, FontManager.RESULT_ERROR_FAILED_UPDATE_CONFIG,

20
services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java
View File

@@ -44,8 +44,10 @@ import org.xmlpull.v1.XmlPullParser;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -413,6 +415,10 @@ public final class UpdatableFontDirTest {
assertThat(mapBeforeUpgrade).containsKey("test.ttf"); assertThat(mapBeforeUpgrade).containsKey("test.ttf");
assertWithMessage("Older fonts should not be deleted until next loadFontFileMap") assertWithMessage("Older fonts should not be deleted until next loadFontFileMap")
.that(parser.getRevision(mapBeforeUpgrade.get("test.ttf"))).isEqualTo(1); .that(parser.getRevision(mapBeforeUpgrade.get("test.ttf"))).isEqualTo(1);
// Check that updatedFontDirs is pruned.
assertWithMessage("config.updatedFontDirs should only list latest active dirs")
.that(readConfig(mConfigFile).updatedFontDirs)
.containsExactly(dir.getFontFileMap().get("test.ttf").getParentFile().getName());
} }
@Test @Test
@@ -450,6 +456,10 @@ public final class UpdatableFontDirTest {
assertThat(dir.getFontFileMap()).containsKey("test.ttf"); assertThat(dir.getFontFileMap()).containsKey("test.ttf");
assertWithMessage("Font should not be downgraded to an older revision") assertWithMessage("Font should not be downgraded to an older revision")
.that(parser.getRevision(dir.getFontFileMap().get("test.ttf"))).isEqualTo(2); .that(parser.getRevision(dir.getFontFileMap().get("test.ttf"))).isEqualTo(2);
// Check that updatedFontDirs is not updated.
assertWithMessage("config.updatedFontDirs should only list latest active dirs")
.that(readConfig(mConfigFile).updatedFontDirs)
.containsExactly(dir.getFontFileMap().get("test.ttf").getParentFile().getName());
} }
@Test @Test
@@ -875,7 +885,15 @@ public final class UpdatableFontDirTest {
return new FontUpdateRequest(family); return new FontUpdateRequest(family);
} }
private void writeConfig(PersistentSystemFontConfig.Config config, private static PersistentSystemFontConfig.Config readConfig(File file) throws Exception {
PersistentSystemFontConfig.Config config = new PersistentSystemFontConfig.Config();
try (InputStream is = new FileInputStream(file)) {
PersistentSystemFontConfig.loadFromXml(is, config);
}
return config;
}
private static void writeConfig(PersistentSystemFontConfig.Config config,
File file) throws IOException { File file) throws IOException {
try (FileOutputStream fos = new FileOutputStream(file)) { try (FileOutputStream fos = new FileOutputStream(file)) {
PersistentSystemFontConfig.writeToXml(fos, config); PersistentSystemFontConfig.writeToXml(fos, config);