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

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

Merge "Add packageName to ApplicationInfo for APEX."

parents e1a96063 50a21480

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

+1 −0
Original line number Diff line number Diff line
@@ -8512,6 +8512,7 @@ public class PackageParser { 
            collectCerts ? PackageParser.PARSE_COLLECT_CERTIFICATES : 0);



        pi.packageName = apk.packageName;

        ai.packageName = apk.packageName;

        pi.setLongVersionCode(apk.getLongVersionCode());

        ai.setVersionCode(apk.getLongVersionCode());

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

+2 −0
Original line number Diff line number Diff line
@@ -527,12 +527,14 @@ public class PackageParserTest { 
                R.raw.com_android_tzdata);

        PackageInfo pi = PackageParser.generatePackageInfoFromApex(apexFile, false);

        assertEquals("com.google.android.tzdata", pi.packageName);

        assertEquals("com.google.android.tzdata", pi.applicationInfo.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("com.google.android.tzdata", pi.applicationInfo.packageName);

        assertEquals(1, pi.getLongVersionCode());

        assertEquals(1, pi.applicationInfo.longVersionCode);

        assertNotNull(pi.signingInfo);