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

Commit abba5610 authored by Andrew Scull's avatar Andrew Scull Committed by Automerger Merge Worker
Browse files

Merge "Remove non-existant shell command parameter" into main am: bbc6fc31... 

Merge "Remove non-existant shell command parameter" into main am: bbc6fc31 am: c7b8aaff am: 35461a1b

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



Change-Id: Ibd19b5cd83bf7eebe2eeaa4a60cd8ae8dee75631
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d387f36c 35461a1b

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

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class RemoteProvisioningShellCommand extends ShellCommand { 
            + "  Show this message.\n"

            + "dump\n"

            + "  Dump service diagnostics.\n"

            + "list [--min-version MIN_VERSION]\n"

            + "list\n"

            + "  List the names of the IRemotelyProvisionedComponent instances.\n"

            + "csr [--challenge CHALLENGE] NAME\n"

            + "  Generate and print a base64-encoded CSR from the named\n"