From ee6e80bdd2a402d5c14823c4b8471c191ce59f09 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Thu, 13 Apr 2023 12:04:52 +0900 Subject: [PATCH] Change userdebug/eng check with debuggable device. Bug: 270484361 Bug: 275538125 Test: N/A Change-Id: I67293d914383583b36b25a7bd8758b7c14a10c6d --- .../android/server/graphics/fonts/FontManagerService.java | 6 +++--- .../server/graphics/fonts/FontManagerShellCommand.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/graphics/fonts/FontManagerService.java b/services/core/java/com/android/server/graphics/fonts/FontManagerService.java index 01cae42ea7aae..ad640b18b80cb 100644 --- a/services/core/java/com/android/server/graphics/fonts/FontManagerService.java +++ b/services/core/java/com/android/server/graphics/fonts/FontManagerService.java @@ -239,7 +239,7 @@ public final class FontManagerService extends IFontManager.Stub { String[] certs = mContext.getResources().getStringArray( R.array.config_fontManagerServiceCerts); - if (mDebugCertFilePath != null && (Build.IS_USERDEBUG || Build.IS_ENG)) { + if (mDebugCertFilePath != null && Build.IS_DEBUGGABLE) { String[] tmp = new String[certs.length + 1]; System.arraycopy(certs, 0, tmp, 0, certs.length); tmp[certs.length] = mDebugCertFilePath; @@ -251,8 +251,8 @@ public final class FontManagerService extends IFontManager.Stub { } /** - * Add debug certificate to the cert list. This must be called only on userdebug/eng - * build. + * Add debug certificate to the cert list. This must be called only on debuggable build. + * * @param debugCertPath a debug certificate file path */ public void addDebugCertificate(@Nullable String debugCertPath) { diff --git a/services/core/java/com/android/server/graphics/fonts/FontManagerShellCommand.java b/services/core/java/com/android/server/graphics/fonts/FontManagerShellCommand.java index c039a836843cd..6d82841da3a45 100644 --- a/services/core/java/com/android/server/graphics/fonts/FontManagerShellCommand.java +++ b/services/core/java/com/android/server/graphics/fonts/FontManagerShellCommand.java @@ -105,8 +105,8 @@ public class FontManagerShellCommand extends ShellCommand { w.println(" Update font families with the new definitions."); w.println(); w.println("install-debug-cert [cert file path]"); - w.println(" Install debug certificate file. This command can be used only on userdebug"); - w.println(" or eng device with root user."); + w.println(" Install debug certificate file. This command can be used only on"); + w.println(" debuggable device with root user."); w.println(); w.println("clear"); w.println(" Remove all installed font files and reset to the initial state.");