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

Commit 9f7005c5 authored by Song Chun Fan's avatar Song Chun Fan Committed by Android (Google) Code Review
Browse files

Merge "[pm] consolidate InstallRequest and InstalledPackageInfo"

parents ce3586ec 828ca4d4

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

+2 −1
Original line number Diff line number Diff line
@@ -271,7 +271,8 @@ final class DeletePackageHelper { 
        // other processes clean up before deleting resources.

        synchronized (mPm.mInstallLock) {

            if (info.mArgs != null) {

                mRemovePackageHelper.cleanUpResources(info.mArgs);

                mRemovePackageHelper.cleanUpResources(info.mArgs.mCodeFile,

                        info.mArgs.mInstructionSets);

            }



            boolean reEnableStub = false;

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

+3 −16
Original line number Diff line number Diff line
@@ -70,10 +70,9 @@ final class InstallArgs { 
            UserHandle user, String[] instructionSets,

            String abiOverride, String[] installGrantPermissions,

            List<String> allowlistedRestrictedPermissions,

            int autoRevokePermissionsMode,

            String traceMethod, int traceCookie, SigningDetails signingDetails,

            int installReason, int installScenario, boolean forceQueryableOverride,

            int dataLoaderType, int packageSource) {

            int autoRevokePermissionsMode, String traceMethod, int traceCookie,

            SigningDetails signingDetails, int installReason, int installScenario,

            boolean forceQueryableOverride, int dataLoaderType, int packageSource) {

        mOriginInfo = originInfo;

        mMoveInfo = moveInfo;

        mInstallFlags = installFlags;
@@ -96,18 +95,6 @@ final class InstallArgs { 
        mPackageSource = packageSource;

    }



    /** New install */

    InstallArgs(InstallingSession params) {

        this(params.mOriginInfo, params.mMoveInfo, params.mObserver, params.mInstallFlags,

                params.mInstallSource, params.mVolumeUuid,

                params.getUser(), null /*instructionSets*/, params.mPackageAbiOverride,

                params.mGrantedRuntimePermissions, params.mAllowlistedRestrictedPermissions,

                params.mAutoRevokePermissionsMode,

                params.mTraceMethod, params.mTraceCookie, params.mSigningDetails,

                params.mInstallReason, params.mInstallScenario, params.mForceQueryableOverride,

                params.mDataLoaderType, params.mPackageSource);

    }



    /**

     * Create args that describe an existing installed package. Typically used

     * when cleaning up old installs, or used as a move source.