Merge "Change userdebug or eng condition check with debuggable" into udc-dev

This commit is contained in:
Treehugger Robot
2023-04-11 03:28:52 +00:00
committed by Android (Google) Code Review

View File

@@ -334,8 +334,8 @@ public class FontManagerShellCommand extends ShellCommand {
}
private int installCert(ShellCommand shell) throws SystemFontException {
if (!(Build.IS_USERDEBUG || Build.IS_ENG)) {
throw new SecurityException("Only userdebug/eng device can add debug certificate");
if (!Build.IS_DEBUGGABLE) {
throw new SecurityException("Only debuggable device can add debug certificate");
}
if (Binder.getCallingUid() != Process.ROOT_UID) {
throw new SecurityException("Only root can add debug certificate");