Merge "Change userdebug/eng check with debuggable device." into udc-dev (3b2fc2f3) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/graphics/fonts/FontManagerService.java

+3 −3

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

+2 −2

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