commit 52faea7acbad5bf9c2006db79353390ea915b18d
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 24 20:54:33 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 24 20:54:36 2017 +0000
tree 67290d4bc536a4cb20a46d1ba5be15c8f567a0dd
parent ef6be9fbdb14e9686d8b710da10142b7eb9987ac
parent badc69af3d741a737900eddd90279ab94e15a88a

Merge "Don't emit versioncode by default"

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

diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index aa421b1..49b96b0 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -587,6 +587,7 @@
         boolean listSystem = false, listThirdParty = false;
         boolean listInstaller = false;
         boolean showUid = false;
+        boolean showVersionCode = false;
         int uid = -1;
         int userId = UserHandle.USER_SYSTEM;
         try {
@@ -620,6 +621,9 @@
                     case "-3":
                         listThirdParty = true;
                         break;
+                    case "--show-versioncode":
+                        showVersionCode = true;
+                        break;
                     case "--user":
                         userId = UserHandle.parseUserArg(getNextArgRequired());
                         break;
@@ -664,8 +668,11 @@
                     pw.print(info.applicationInfo.sourceDir);
                     pw.print("=");
                 }
-                pw.print(info.packageName); pw.print( " versionCode:"
-                        + info.applicationInfo.versionCode);
+                pw.print(info.packageName);
+                if (showVersionCode) {
+                    pw.print(" versionCode:");
+                    pw.print(info.applicationInfo.versionCode);
+                }
                 if (listInstaller) {
                     pw.print("  installer=");
                     pw.print(mInterface.getInstallerPackageName(info.packageName));