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

Commit b8edd321 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Show version for APEXes" am: 02f874d5 

am: 3a4aa90f

Change-Id: I7130b6ae1e98411aa8e84dcc01e516528a9db861
parents 51beefd2 3a4aa90f

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

+8 −3
Original line number Diff line number Diff line
@@ -627,9 +627,13 @@ class PackageManagerShellCommand extends ShellCommand { 
                    pw.print("=");

                }

                pw.print(info.packageName);

                if (showVersionCode && !isApex) {

                if (showVersionCode) {

                    pw.print(" versionCode:");

                    if (info.applicationInfo != null) {

                        pw.print(info.applicationInfo.versionCode);

                    } else {

                        pw.print(info.versionCode);

                    }

                }

                if (listInstaller && !isApex) {

                    pw.print("  installer=");
@@ -2701,7 +2705,7 @@ class PackageManagerShellCommand extends ShellCommand { 
        pw.println("    Prints all system libraries.");

        pw.println("");

        pw.println("  list packages [-f] [-d] [-e] [-s] [-3] [-i] [-l] [-u] [-U] ");

        pw.println("      [--apex-only] [--uid UID] [--user USER_ID] [FILTER]");

        pw.println("      [--show-versioncode] [--apex-only] [--uid UID] [--user USER_ID] [FILTER]");

        pw.println("    Prints all packages; optionally only those whose name contains");

        pw.println("    the text in FILTER.  Options are:");

        pw.println("      -f: see their associated file");
@@ -2714,6 +2718,7 @@ class PackageManagerShellCommand extends ShellCommand { 
        pw.println("      -l: ignored (used for compatibility with older releases)");

        pw.println("      -U: also show the package UID");

        pw.println("      -u: also include uninstalled packages");

        pw.println("      --show-versioncode: also show the version code");

        pw.println("      --apex-only: only show APEX packages");

        pw.println("      --uid UID: filter to only show packages with the given UID");

        pw.println("      --user USER_ID: only list packages belonging to the given user");