Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9637a586 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "remote_provisioning_diagnostics" am: 696dce6c am:... 

Merge changes from topic "remote_provisioning_diagnostics" am: 696dce6c am: b8f747cd am: 6d14cd87 am: 27a514cb

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



Change-Id: Ie670c7400b7b20b318674d4051d31d4e7ce97d2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6afdb1c0 27a514cb

services/core/java/com/android/server/security/rkp/RemoteProvisioningShellCommand.java

+4 −2
Original line number Diff line number Diff line
@@ -134,8 +134,10 @@ class RemoteProvisioningShellCommand extends ShellCommand { 
            pw.println("supportedEekCurve=" + info.supportedEekCurve);

        }

        pw.println("uniqueId=" + info.uniqueId);

        if (info.versionNumber >= 3) {

            pw.println("supportedNumKeysInCsr=" + info.supportedNumKeysInCsr);

        }

    }



    private int list() throws RemoteException {

        for (String name : mInjector.getIrpcNames()) {
@@ -153,7 +155,7 @@ class RemoteProvisioningShellCommand extends ShellCommand { 
                    challenge = Base64.getDecoder().decode(getNextArgRequired());

                    break;

                default:

                    getErrPrintWriter().println("error: unknown option");

                    getErrPrintWriter().println("error: unknown option " + opt);

                    return ERROR;

            }

        }