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

Commit c8ab84df authored by JW Wang's avatar JW Wang
Browse files

Fix the isSystemApp flag for APEX 

To be consistent with the behavior of system APKs. An updated
APEX (in /data) is still considered as a system app.

Fix tests by checking the FLAG_UPDATED_SYSTEM_APP flag instead
against updated APEX.

Bug: 225760014
Bug: 225756739
Test: atest CtsStagedInstallHostTestCases \
            com.android.server.pm.ApexManagerTest \
	    GtsStagedInstallHostTestCases
Change-Id: Idc4d9976cb0e075f9ddcd59378314c9941fd9fa5
parent dda57023

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

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ public abstract class ApexManager { 
     * @return {@code true} if this package is pre-installed, {@code false} otherwise.

     */

    public static boolean isFactory(@NonNull PackageInfo packageInfo) {

        return (packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;

        return (packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) == 0;

    }



    /**

services/core/java/com/android/server/pm/pkg/parsing/PackageInfoWithoutStateUtils.java

+1 −2
Original line number Diff line number Diff line
@@ -321,11 +321,10 @@ public class PackageInfoWithoutStateUtils { 


            pi.applicationInfo.sourceDir = apexFile.getPath();

            pi.applicationInfo.publicSourceDir = apexFile.getPath();

            if (apexInfo.isFactory) {

            pi.applicationInfo.flags |= ApplicationInfo.FLAG_SYSTEM;

            if (apexInfo.isFactory) {

                pi.applicationInfo.flags &= ~ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;

            } else {

                pi.applicationInfo.flags &= ~ApplicationInfo.FLAG_SYSTEM;

                pi.applicationInfo.flags |= ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;

            }

            if (apexInfo.isActive) {

services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java

+4 −2
Original line number Diff line number Diff line
@@ -386,7 +386,8 @@ public class ApexManagerTest { 
                ApexManager.MATCH_ACTIVE_PACKAGE);

        assertThat(newInfo.applicationInfo.sourceDir).isEqualTo(finalApex.getAbsolutePath());

        assertThat(newInfo.applicationInfo.longVersionCode).isEqualTo(2);

        assertThat(newInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM).isEqualTo(0);

        assertThat(newInfo.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)

                .isEqualTo(ApplicationInfo.FLAG_UPDATED_SYSTEM_APP);

        assertThat(newInfo.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED)

            .isEqualTo(ApplicationInfo.FLAG_INSTALLED);
@@ -424,7 +425,8 @@ public class ApexManagerTest { 
                ApexManager.MATCH_ACTIVE_PACKAGE);

        assertThat(newInfo.applicationInfo.sourceDir).isEqualTo(finalApex.getAbsolutePath());

        assertThat(newInfo.applicationInfo.longVersionCode).isEqualTo(2);

        assertThat(newInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM).isEqualTo(0);

        assertThat(newInfo.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)

                .isEqualTo(ApplicationInfo.FLAG_UPDATED_SYSTEM_APP);

        assertThat(newInfo.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED)

            .isEqualTo(ApplicationInfo.FLAG_INSTALLED);

services/tests/servicestests/src/com/android/server/pm/parsing/PackageParserLegacyCoreTest.java

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ public class PackageParserLegacyCoreTest { 
        assertNotNull(pi.signingInfo);

        assertTrue(pi.signingInfo.getApkContentsSigners().length > 0);

        assertTrue(pi.isApex);

        assertTrue((pi.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0);

        assertTrue((pi.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0);

        assertTrue((pi.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED) != 0);

    }

tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java

+2 −1
Original line number Diff line number Diff line
@@ -460,7 +460,8 @@ public class StagedInstallInternalTest { 
        {

            PackageInfo apex = pm.getPackageInfo("test.apex.rebootless", PackageManager.MATCH_APEX);

            assertThat(apex.getLongVersionCode()).isEqualTo(1);

            assertThat(apex.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM).isEqualTo(0);

            assertThat(apex.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)

                    .isEqualTo(ApplicationInfo.FLAG_UPDATED_SYSTEM_APP);

            assertThat(apex.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED)

                    .isEqualTo(ApplicationInfo.FLAG_INSTALLED);

            assertThat(apex.applicationInfo.sourceDir).startsWith("/data/apex/active");