diff options
3 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 88a240f240cd..d5636d5fc91f 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -8513,6 +8513,7 @@ public class PackageParser { pi.packageName = apk.packageName; pi.setLongVersionCode(apk.getLongVersionCode()); + ai.setVersionCode(apk.getLongVersionCode()); if (collectCerts) { if (apk.signingDetails.hasPastSigningCertificates()) { diff --git a/core/tests/coretests/src/android/content/pm/PackageParserTest.java b/core/tests/coretests/src/android/content/pm/PackageParserTest.java index c5454a649e73..7b92cf50ee21 100644 --- a/core/tests/coretests/src/android/content/pm/PackageParserTest.java +++ b/core/tests/coretests/src/android/content/pm/PackageParserTest.java @@ -528,11 +528,13 @@ public class PackageParserTest { PackageInfo pi = PackageParser.generatePackageInfoFromApex(apexFile, false); assertEquals("com.google.android.tzdata", pi.packageName); assertEquals(1, pi.getLongVersionCode()); + assertEquals(1, pi.applicationInfo.longVersionCode); assertNull(pi.signingInfo); pi = PackageParser.generatePackageInfoFromApex(apexFile, true); assertEquals("com.google.android.tzdata", pi.packageName); assertEquals(1, pi.getLongVersionCode()); + assertEquals(1, pi.applicationInfo.longVersionCode); assertNotNull(pi.signingInfo); assertTrue(pi.signingInfo.getApkContentsSigners().length > 0); } diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 022c1aad8113..35626304be1a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -40,10 +40,10 @@ import android.content.pm.InstrumentationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageInstaller; import android.content.pm.PackageInstaller.SessionParams; -import android.content.pm.PackageManagerInternal; import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.PackageManagerInternal; import android.content.pm.PackageParser; import android.content.pm.PackageParser.ApkLite; import android.content.pm.PackageParser.PackageLite; @@ -634,9 +634,9 @@ class PackageManagerShellCommand extends ShellCommand { if (showVersionCode) { pw.print(" versionCode:"); if (info.applicationInfo != null) { - pw.print(info.applicationInfo.versionCode); + pw.print(info.applicationInfo.longVersionCode); } else { - pw.print(info.versionCode); + pw.print(info.getLongVersionCode()); } } if (listInstaller && !isApex) { |