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

Commit f727d0dc authored by Rhed Jao's avatar Rhed Jao
Browse files

Move logics of suspending packages out of package manager service 

Bug: 201334238
Test: atest com.android.server.pm.SuspendPackagesTest
Test: atest CtsSuspendAppsTestCases
Test: atest CtsSuspendAppsPermissionTestCases
Test: atest SuspendPackageHelperTest
Change-Id: I88940b68b07ea0acdac4fcce6649431e4bb1e4b8
parent e11afa83

services/core/java/android/content/pm/PackageManagerInternal.java

+18 −14
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ public abstract class PackageManagerInternal implements PackageSettingsSnapshotP 
            PACKAGE_SYSTEM,

            PACKAGE_SETUP_WIZARD,

            PACKAGE_INSTALLER,

            PACKAGE_UNINSTALLER,

            PACKAGE_VERIFIER,

            PACKAGE_BROWSER,

            PACKAGE_SYSTEM_TEXT_CLASSIFIER,
@@ -89,20 +90,21 @@ public abstract class PackageManagerInternal implements PackageSettingsSnapshotP 
    public static final int PACKAGE_SYSTEM = 0;

    public static final int PACKAGE_SETUP_WIZARD = 1;

    public static final int PACKAGE_INSTALLER = 2;

    public static final int PACKAGE_VERIFIER = 3;

    public static final int PACKAGE_BROWSER = 4;

    public static final int PACKAGE_SYSTEM_TEXT_CLASSIFIER = 5;

    public static final int PACKAGE_PERMISSION_CONTROLLER = 6;

    public static final int PACKAGE_WELLBEING = 7;

    public static final int PACKAGE_DOCUMENTER = 8;

    public static final int PACKAGE_CONFIGURATOR = 9;

    public static final int PACKAGE_INCIDENT_REPORT_APPROVER = 10;

    public static final int PACKAGE_APP_PREDICTOR = 11;

    public static final int PACKAGE_OVERLAY_CONFIG_SIGNATURE = 12;

    public static final int PACKAGE_WIFI = 13;

    public static final int PACKAGE_COMPANION = 14;

    public static final int PACKAGE_RETAIL_DEMO = 15;

    public static final int PACKAGE_RECENTS = 16;

    public static final int PACKAGE_UNINSTALLER = 3;

    public static final int PACKAGE_VERIFIER = 4;

    public static final int PACKAGE_BROWSER = 5;

    public static final int PACKAGE_SYSTEM_TEXT_CLASSIFIER = 6;

    public static final int PACKAGE_PERMISSION_CONTROLLER = 7;

    public static final int PACKAGE_WELLBEING = 8;

    public static final int PACKAGE_DOCUMENTER = 9;

    public static final int PACKAGE_CONFIGURATOR = 10;

    public static final int PACKAGE_INCIDENT_REPORT_APPROVER = 11;

    public static final int PACKAGE_APP_PREDICTOR = 12;

    public static final int PACKAGE_OVERLAY_CONFIG_SIGNATURE = 13;

    public static final int PACKAGE_WIFI = 14;

    public static final int PACKAGE_COMPANION = 15;

    public static final int PACKAGE_RETAIL_DEMO = 16;

    public static final int PACKAGE_RECENTS = 17;

    // Integer value of the last known package ID. Increases as new ID is added to KnownPackage.

    // Please note the numbers should be continuous.

    public static final int LAST_KNOWN_PACKAGE = PACKAGE_RECENTS;
@@ -1141,6 +1143,8 @@ public abstract class PackageManagerInternal implements PackageSettingsSnapshotP 
                return "Setup Wizard";

            case PACKAGE_INSTALLER:

                return "Installer";

            case PACKAGE_UNINSTALLER:

                return "Uninstaller";

            case PACKAGE_VERIFIER:

                return "Verifier";

            case PACKAGE_BROWSER:

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

+30 −410

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −0
Original line number Diff line number Diff line
@@ -111,4 +111,5 @@ public final class PackageManagerServiceTestParams { 
    public PreferredActivityHelper preferredActivityHelper;

    public ResolveIntentHelper resolveIntentHelper;

    public DexOptHelper dexOptHelper;

    public SuspendPackageHelper suspendPackageHelper;

}

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

0 → 100644
+611 −0

File added.

Preview size limit exceeded, changes collapsed.

services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt

+2 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ class MockSystem(withSession: (StaticMockitoSessionBuilder) -> Unit = {}) { 
        val displayMetrics: DisplayMetrics = mock()

        val domainVerificationManagerInternal: DomainVerificationManagerInternal = mock()

        val handler = TestHandler(null)

        val defaultAppProvider: DefaultAppProvider = mock()

    }



    companion object {
@@ -294,6 +295,7 @@ class MockSystem(withSession: (StaticMockitoSessionBuilder) -> Unit = {}) { 
        whenever(mocks.injector.domainVerificationManagerInternal)

            .thenReturn(mocks.domainVerificationManagerInternal)

        whenever(mocks.injector.handler) { mocks.handler }

        whenever(mocks.injector.defaultAppProvider) { mocks.defaultAppProvider }

        wheneverStatic { SystemConfig.getInstance() }.thenReturn(mocks.systemConfig)

        whenever(mocks.systemConfig.availableFeatures).thenReturn(DEFAULT_AVAILABLE_FEATURES_MAP)

        whenever(mocks.systemConfig.sharedLibraries).thenReturn(DEFAULT_SHARED_LIBRARIES_LIST)