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

Commit badc69af authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Don't emit versioncode by default 

use --show-versioncode argument if you want to see them

Change-Id: I4ec6236c2c7643e61529765bce24f03555944c3e
Fixes: 34670329
Test: Manually run 'adb shell cmd package list packages' w/ and w/o --show-versioncode
parent 4d38df3c

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

+9 −2
Original line number Original line Diff line number Diff line
@@ -587,6 +587,7 @@ class PackageManagerShellCommand extends ShellCommand { 
        boolean listSystem = false, listThirdParty = false;

        boolean listSystem = false, listThirdParty = false;

        boolean listInstaller = false;

        boolean listInstaller = false;

        boolean showUid = false;

        boolean showUid = false;

        boolean showVersionCode = false;

        int uid = -1;

        int uid = -1;

        int userId = UserHandle.USER_SYSTEM;

        int userId = UserHandle.USER_SYSTEM;

        try {

        try {
@@ -620,6 +621,9 @@ class PackageManagerShellCommand extends ShellCommand { 
                    case "-3":

                    case "-3":

                        listThirdParty = true;

                        listThirdParty = true;

                        break;

                        break;

                    case "--show-versioncode":

                        showVersionCode = true;

                        break;

                    case "--user":

                    case "--user":

                        userId = UserHandle.parseUserArg(getNextArgRequired());

                        userId = UserHandle.parseUserArg(getNextArgRequired());

                        break;

                        break;
@@ -664,8 +668,11 @@ class PackageManagerShellCommand extends ShellCommand { 
                    pw.print(info.applicationInfo.sourceDir);

                    pw.print(info.applicationInfo.sourceDir);

                    pw.print("=");

                    pw.print("=");

                }

                }

                pw.print(info.packageName); pw.print( " versionCode:"

                pw.print(info.packageName);

                        + info.applicationInfo.versionCode);

                if (showVersionCode) {

                    pw.print(" versionCode:");

                    pw.print(info.applicationInfo.versionCode);

                }

                if (listInstaller) {

                if (listInstaller) {

                    pw.print("  installer=");

                    pw.print("  installer=");

                    pw.print(mInterface.getInstallerPackageName(info.packageName));

                    pw.print(mInterface.getInstallerPackageName(info.packageName));