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

Merge "Make updatable font files readable by apps." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-28 07:36:56 +00:00
committed by Android (Google) Code Review
parent 258ae119c9 077c31c31d
commit 5974b291e9
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,8 @@ import android.annotation.Nullable;
import android.graphics.fonts.FontManager; import android.graphics.fonts.FontManager;
import android.graphics.fonts.SystemFonts; import android.graphics.fonts.SystemFonts;
import android.os.FileUtils; import android.os.FileUtils;
import android.system.ErrnoException;
import android.system.Os;
import android.text.FontConfig; import android.text.FontConfig;
import android.util.Base64; import android.util.Base64;
import android.util.Slog; import android.util.Slog;
@@ -223,6 +225,14 @@ final class UpdatableFontDir {
FontManager.ERROR_CODE_FAILED_TO_WRITE_FONT_FILE, FontManager.ERROR_CODE_FAILED_TO_WRITE_FONT_FILE,
"Failed to create font directory."); "Failed to create font directory.");
} }
try {
// Make newDir executable so that apps can access font file inside newDir.
Os.chmod(newDir.getAbsolutePath(), 0711);
} catch (ErrnoException e) {
throw new SystemFontException(
FontManager.ERROR_CODE_FAILED_TO_WRITE_FONT_FILE,
"Failed to change mode to 711", e);
}
boolean success = false; boolean success = false;
try { try {
File tempNewFontFile = new File(newDir, "font.ttf"); File tempNewFontFile = new File(newDir, "font.ttf");
@@ -262,6 +272,14 @@ final class UpdatableFontDir {
FontManager.ERROR_CODE_FAILED_TO_WRITE_FONT_FILE, FontManager.ERROR_CODE_FAILED_TO_WRITE_FONT_FILE,
"Failed to move verified font file."); "Failed to move verified font file.");
} }
try {
// Make the font file readable by apps.
Os.chmod(newFontFile.getAbsolutePath(), 0644);
} catch (ErrnoException e) {
throw new SystemFontException(
FontManager.ERROR_CODE_FAILED_TO_WRITE_FONT_FILE,
"Failed to change mode to 711", e);
}
FontFileInfo fontFileInfo = validateFontFile(newFontFile); FontFileInfo fontFileInfo = validateFontFile(newFontFile);
// Write config file. // Write config file.

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

@@ -25,6 +25,7 @@ import android.content.Context;
import android.graphics.fonts.FontManager; import android.graphics.fonts.FontManager;
import android.os.FileUtils; import android.os.FileUtils;
import android.platform.test.annotations.Presubmit; import android.platform.test.annotations.Presubmit;
import android.system.Os;
import androidx.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
@@ -281,6 +282,10 @@ public final class UpdatableFontDirTest {
installFontFile(dir, "test,1", GOOD_SIGNATURE); installFontFile(dir, "test,1", GOOD_SIGNATURE);
assertThat(dir.getFontFileMap()).containsKey("test.ttf"); assertThat(dir.getFontFileMap()).containsKey("test.ttf");
assertThat(parser.getRevision(dir.getFontFileMap().get("test.ttf"))).isEqualTo(1); assertThat(parser.getRevision(dir.getFontFileMap().get("test.ttf"))).isEqualTo(1);
File fontFile = dir.getFontFileMap().get("test.ttf");
assertThat(Os.stat(fontFile.getAbsolutePath()).st_mode & 0777).isEqualTo(0644);
File fontDir = fontFile.getParentFile();
assertThat(Os.stat(fontDir.getAbsolutePath()).st_mode & 0777).isEqualTo(0711);
} }
@Test @Test