Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set ApplicationInfo (long)versionCode for APEX."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-23 21:54:33 +00:00
committed by Android (Google) Code Review
parent e2a693b746 788ecb19e4
commit c78f97002e
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/content/pm/PackageParser.java
View File

@@ -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()) {

2
core/tests/coretests/src/android/content/pm/PackageParserTest.java
View File

@@ -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);
}

6
services/core/java/com/android/server/pm/PackageManagerShellCommand.java
View File

@@ -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) {