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

Commit 788ecb19 authored by Dario Freni's avatar Dario Freni
Browse files

Set ApplicationInfo (long)versionCode for APEX. 

PackageManagerShellCommand defaults to the versionCode contained in
PackageInfo.ApplicationInfo if ApplicationInfo is present. Set
longVersionCode to both PackageInfo and ApplicationInfo, and also change
PackageManagerShellCommand to use longVersionCode instead of the
deprecated versionCode.

Test: atest android.content.pm.PackageParserTest#testApexPackageInfoGeneration
Test: atest apex_e2e_tests
Bug: 123228186
Bug: 123086053
Change-Id: Ief32f708ba2fa997ac4175134db5bfac2e5eb1d2
parent 448fb122

core/java/android/content/pm/PackageParser.java

+1 −0
Original line number Diff line number Diff line
@@ -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()) {

core/tests/coretests/src/android/content/pm/PackageParserTest.java

+2 −0
Original line number Diff line number Diff line
@@ -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);

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -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) {