Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "remote_provisioning_diagnostics" am: 696dce6c81

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2550990

Change-Id: Ie565196b18314f29d2afc68f8c6bacb151cc07f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-21 14:53:02 +00:00
committed by Automerger Merge Worker
parent 6df77a2f6c 696dce6c81
commit b8f747cde8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/security/rkp/RemoteProvisioningShellCommand.java
View File

@@ -134,7 +134,9 @@ class RemoteProvisioningShellCommand extends ShellCommand {
pw.println("supportedEekCurve=" + info.supportedEekCurve); pw.println("supportedEekCurve=" + info.supportedEekCurve);
} }
pw.println("uniqueId=" + info.uniqueId); pw.println("uniqueId=" + info.uniqueId);
pw.println("supportedNumKeysInCsr=" + info.supportedNumKeysInCsr); if (info.versionNumber >= 3) {
pw.println("supportedNumKeysInCsr=" + info.supportedNumKeysInCsr);
}
} }
private int list() throws RemoteException { private int list() throws RemoteException {
@@ -153,7 +155,7 @@ class RemoteProvisioningShellCommand extends ShellCommand {
challenge = Base64.getDecoder().decode(getNextArgRequired()); challenge = Base64.getDecoder().decode(getNextArgRequired());
break; break;
default: default:
getErrPrintWriter().println("error: unknown option"); getErrPrintWriter().println("error: unknown option " + opt);
return ERROR; return ERROR;
} }
} }