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

Merge "Update FontManager#getFontConfig to require permission" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-12 07:59:09 +00:00
committed by Android (Google) Code Review
parent a9808c3abd 84383b5ef8
commit 45125b21b4
6 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -2901,7 +2901,7 @@ package android.graphics.fonts {
}
public class FontManager {
method @NonNull public android.text.FontConfig getFontConfig();
method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_FONTS) public android.text.FontConfig getFontConfig();
method @RequiresPermission(android.Manifest.permission.UPDATE_FONTS) public int updateFontFamily(@NonNull android.graphics.fonts.FontFamilyUpdateRequest, @IntRange(from=0) int);
field public static final int RESULT_ERROR_DOWNGRADING = -5; // 0xfffffffb
field public static final int RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE = -1; // 0xffffffff

2
core/api/test-current.txt
View File

@@ -972,7 +972,7 @@ package android.graphics.drawable {
package android.graphics.fonts {
public class FontManager {
method @NonNull public android.text.FontConfig getFontConfig();
method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_FONTS) public android.text.FontConfig getFontConfig();
method @RequiresPermission(android.Manifest.permission.UPDATE_FONTS) public int updateFontFamily(@NonNull android.graphics.fonts.FontFamilyUpdateRequest, @IntRange(from=0) int);
field public static final int RESULT_ERROR_DOWNGRADING = -5; // 0xfffffffb
field public static final int RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE = -1; // 0xffffffff

1
core/java/android/graphics/fonts/FontManager.java
View File

@@ -195,6 +195,7 @@ public class FontManager {
* @return The current font configuration. null if failed to fetch information from the system
* service.
*/
@RequiresPermission(Manifest.permission.UPDATE_FONTS)
public @NonNull FontConfig getFontConfig() {
try {
return mIFontManager.getFontConfig();

2
data/etc/privapp-permissions-platform.xml
View File

@@ -488,6 +488,8 @@ applications that come with the platform
<permission name="android.permission.MANAGE_UI_TRANSLATION" />
<!-- Permission required for CTS test - ClipboardManagerTest -->
<permission name="android.permission.SET_CLIP_SOURCE" />
<!-- Permission required for CTS test - FontManagerTest -->
<permission name="android.permission.UPDATE_FONTS" />
</privapp-permissions>
<privapp-permissions package="com.android.statementservice">

3
packages/Shell/AndroidManifest.xml
View File

@@ -426,6 +426,9 @@
<!-- Permission required for CTS test - ClipboardManagerTest -->
<uses-permission android:name="android.permission.SET_CLIP_SOURCE" />
<!-- Permission required for CTS test - FontManagerTest -->
<uses-permission android:name="android.permission.UPDATE_FONTS" />
<application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true"

2
services/core/java/com/android/server/graphics/fonts/FontManagerService.java
View File

@@ -67,6 +67,8 @@ public final class FontManagerService extends IFontManager.Stub {
@Override
public FontConfig getFontConfig() {
getContext().enforceCallingPermission(Manifest.permission.UPDATE_FONTS,
"UPDATE_FONTS permission required.");
return getSystemFontConfig();
}