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

Commit ce7ce8b6 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 4b55eac4: Merge "Remove some unnecessary man page entries" into jb-dev 

* commit '4b55eac4':
  Remove some unnecessary man page entries
parents 11855f31 4b55eac4

cmds/am/src/com/android/commands/am/Am.java

+0 −1
Original line number Diff line number Diff line
@@ -1301,7 +1301,6 @@ public class Am { 
                "       am display-size [reset|MxN]\n" +

                "       am to-uri [INTENT]\n" +

                "       am to-intent-uri [INTENT]\n" +

                "       am switch-user <USER_ID>\n" +

                "\n" +

                "am start: start an Activity.  Options are:\n" +

                "    -D: enable debugging\n" +

cmds/pm/src/com/android/commands/pm/Pm.java

+3 −6
Original line number Diff line number Diff line
@@ -1360,22 +1360,19 @@ public final class Pm { 
        System.err.println("       pm list instrumentation [-f] [TARGET-PACKAGE]");

        System.err.println("       pm list features");

        System.err.println("       pm list libraries");

        System.err.println("       pm list users");

        System.err.println("       pm path PACKAGE");

        System.err.println("       pm install [-l] [-r] [-t] [-i INSTALLER_PACKAGE_NAME] [-s] [-f]");

        System.err.println("                  [--algo <algorithm name> --key <key-in-hex> --iv <IV-in-hex>] PATH");

        System.err.println("       pm uninstall [-k] PACKAGE");

        System.err.println("       pm clear PACKAGE");

        System.err.println("       pm enable [--user USER_ID] PACKAGE_OR_COMPONENT");

        System.err.println("       pm disable [--user USER_ID] PACKAGE_OR_COMPONENT");

        System.err.println("       pm disable-user [--user USER_ID] PACKAGE_OR_COMPONENT");

        System.err.println("       pm enable PACKAGE_OR_COMPONENT");

        System.err.println("       pm disable PACKAGE_OR_COMPONENT");

        System.err.println("       pm disable-user PACKAGE_OR_COMPONENT");

        System.err.println("       pm grant PACKAGE PERMISSION");

        System.err.println("       pm revoke PACKAGE PERMISSION");

        System.err.println("       pm set-install-location [0/auto] [1/internal] [2/external]");

        System.err.println("       pm get-install-location");

        System.err.println("       pm set-permission-enforced PERMISSION [true|false]");

        System.err.println("       pm create-user USER_NAME");

        System.err.println("       pm remove-user USER_ID");

        System.err.println("");

        System.err.println("pm list packages: prints all packages, optionally only");

        System.err.println("  those whose package name contains the text in FILTER.  Options:");