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

Commit c78f9700 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents e2a693b7 788ecb19

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