diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index eddf5a4a92b9c..6019ab56dea7c 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -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
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index 70bf4c22767a5..a7ca44cd4a5ca 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -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
diff --git a/core/java/android/graphics/fonts/FontManager.java b/core/java/android/graphics/fonts/FontManager.java
index 7bf692f1d318b..fa2ccbc189ad2 100644
--- a/core/java/android/graphics/fonts/FontManager.java
+++ b/core/java/android/graphics/fonts/FontManager.java
@@ -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();
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index c49fe8563dab9..a7b6636a15def 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -488,6 +488,8 @@ applications that come with the platform
+
+
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index a28a1e32a2a59..b4194fd5bbf9b 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -426,6 +426,9 @@
+
+
+