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

Commit 45125b21 authored Mar 12, 2021 by TreeHugger Robot Committed by Android (Google) Code Review Mar 12, 2021

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

parents a9808c3a 84383b5e

core/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

core/api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

core/java/android/graphics/fonts/FontManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -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();

data/etc/privapp-permissions-platform.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -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">

packages/Shell/AndroidManifest.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -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"