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

Commit 6321aedb authored by Songchun Fan's avatar Songchun Fan
Browse files

[pm] move mPm related code from ScanPackageHelper to InstallPackageHelper 

Tried to consolidate some of scanPackageNew and scanSystemPackage but
there is some delicate difference that I am not 100% certain to merge.
In this CL I moved all the code that requires mLock into
InstallPackageHelper, and made ScanPackageHelper a utility class. I will
keep doing the same for other helper classes, such as
DeletePackageHelper.

BUG: 199937291
Test: manual
Change-Id: I9f93cc36494e1fff84628026949ca5887bb3e323
parent b9cd53b8

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

+0 −7
Original line number Diff line number Diff line
@@ -74,13 +74,6 @@ final class AppDataHelper { 
        mArtManagerService = mInjector.getArtManagerService();

    }



    AppDataHelper(PackageManagerService pm, PackageManagerServiceInjector injector) {

        mPm = pm;

        mInjector = injector;

        mInstaller = injector.getInstaller();

        mArtManagerService = injector.getArtManagerService();

    }



    /**

     * Prepare app data for the given app just after it was installed or

     * upgraded. This method carefully only touches users that it's installed

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

+819 −405

File changed.

Preview size limit exceeded, changes collapsed.

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

+6 −38
Original line number Diff line number Diff line
@@ -582,13 +582,6 @@ public class PackageManagerService extends IPackageManager.Stub 


    /** Directory where installed applications are stored */

    private final File mAppInstallDir;

    /** Directory where installed application's 32-bit native libraries are copied. */

    @VisibleForTesting

    final File mAppLib32InstallDir;



    static File getAppLib32InstallDir() {

        return new File(Environment.getDataDirectory(), "app-lib");

    }



    // ----------------------------------------------------------------
@@ -975,6 +968,7 @@ public class PackageManagerService extends IPackageManager.Stub 
    private final DeletePackageHelper mDeletePackageHelper;

    private final InitAndSystemPackageHelper mInitAndSystemPackageHelper;

    private final AppDataHelper mAppDataHelper;

    private final InstallPackageHelper mInstallPackageHelper;

    private final PreferredActivityHelper mPreferredActivityHelper;

    private final ResolveIntentHelper mResolveIntentHelper;

    private final DexOptHelper mDexOptHelper;
@@ -1697,7 +1691,6 @@ public class PackageManagerService extends IPackageManager.Stub 
        mEnableFreeCacheV2 = testParams.enableFreeCacheV2;

        mSdkVersion = testParams.sdkVersion;

        mAppInstallDir = testParams.appInstallDir;

        mAppLib32InstallDir = testParams.appLib32InstallDir;

        mIsEngBuild = testParams.isEngBuild;

        mIsUserDebugBuild = testParams.isUserDebugBuild;

        mIncrementalVersion = testParams.incrementalVersion;
@@ -1705,6 +1698,7 @@ public class PackageManagerService extends IPackageManager.Stub 


        mBroadcastHelper = testParams.broadcastHelper;

        mAppDataHelper = testParams.appDataHelper;

        mInstallPackageHelper = testParams.installPackageHelper;

        mRemovePackageHelper = testParams.removePackageHelper;

        mInitAndSystemPackageHelper = testParams.initAndSystemPackageHelper;

        mDeletePackageHelper = testParams.deletePackageHelper;
@@ -1837,7 +1831,6 @@ public class PackageManagerService extends IPackageManager.Stub 
        mInstantAppRegistry = new InstantAppRegistry(this, mPermissionManager, mPmInternal);



        mAppInstallDir = new File(Environment.getDataDirectory(), "app");

        mAppLib32InstallDir = getAppLib32InstallDir();



        mDomainVerificationConnection = new DomainVerificationConnection(this);

        mDomainVerificationManager = injector.getDomainVerificationManagerInternal();
@@ -1845,6 +1838,7 @@ public class PackageManagerService extends IPackageManager.Stub 


        mBroadcastHelper = new BroadcastHelper(mInjector);

        mAppDataHelper = new AppDataHelper(this);

        mInstallPackageHelper = new InstallPackageHelper(this, mAppDataHelper);

        mRemovePackageHelper = new RemovePackageHelper(this, mAppDataHelper);

        mInitAndSystemPackageHelper = new InitAndSystemPackageHelper(this);

        mDeletePackageHelper = new DeletePackageHelper(this, mRemovePackageHelper,
@@ -2006,7 +2000,7 @@ public class PackageManagerService extends IPackageManager.Stub 
                // the rest of the commands above) because there's precious little we

                // can do about it. A settings error is reported, though.

                final List<String> changedAbiCodePath =

                        ScanPackageHelper.applyAdjustedAbiToSharedUser(

                        ScanPackageUtils.applyAdjustedAbiToSharedUser(

                                setting, null /*scannedPackage*/,

                                mInjector.getAbiHelper().getAdjustedAbiForSharedUser(

                                setting.packages, null /*scannedPackage*/));
@@ -4698,35 +4692,10 @@ public class PackageManagerService extends IPackageManager.Stub 
    @Override

    public int installExistingPackageAsUser(String packageName, int userId, int installFlags,

            int installReason, List<String> whiteListedPermissions) {

        final InstallPackageHelper installPackageHelper = new InstallPackageHelper(

                this, mAppDataHelper);

        return installPackageHelper.installExistingPackageAsUser(packageName, userId, installFlags,

        return mInstallPackageHelper.installExistingPackageAsUser(packageName, userId, installFlags,

                installReason, whiteListedPermissions, null);

    }



    static void setInstantAppForUser(PackageManagerServiceInjector injector,

            PackageSetting pkgSetting, int userId, boolean instantApp, boolean fullApp) {

        // no state specified; do nothing

        if (!instantApp && !fullApp) {

            return;

        }

        if (userId != UserHandle.USER_ALL) {

            if (instantApp && !pkgSetting.getInstantApp(userId)) {

                pkgSetting.setInstantApp(true /*instantApp*/, userId);

            } else if (fullApp && pkgSetting.getInstantApp(userId)) {

                pkgSetting.setInstantApp(false /*instantApp*/, userId);

            }

        } else {

            for (int currentUserId : injector.getUserManagerInternal().getUserIds()) {

                if (instantApp && !pkgSetting.getInstantApp(currentUserId)) {

                    pkgSetting.setInstantApp(true /*instantApp*/, currentUserId);

                } else if (fullApp && pkgSetting.getInstantApp(currentUserId)) {

                    pkgSetting.setInstantApp(false /*instantApp*/, currentUserId);

                }

            }

        }

    }



    boolean isUserRestricted(int userId, String restrictionKey) {

        Bundle restrictions = mUserManager.getUserRestrictions(userId);

        if (restrictions.getBoolean(restrictionKey, false)) {
@@ -6733,8 +6702,7 @@ public class PackageManagerService extends IPackageManager.Stub 
            if (isSystemStub

                    && (newState == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT

                    || newState == PackageManager.COMPONENT_ENABLED_STATE_ENABLED)) {

                if (!new InstallPackageHelper(this).enableCompressedPackage(deletedPkg,

                        pkgSetting)) {

                if (!mInstallPackageHelper.enableCompressedPackage(deletedPkg, pkgSetting)) {

                    Slog.w(TAG, "Failed setApplicationEnabledSetting: failed to enable "

                            + "commpressed package " + setting.getPackageName());

                    updateAllowed[i] = false;

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

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ public final class PackageManagerServiceTestParams { 
    public final String incrementalVersion = Build.VERSION.INCREMENTAL;

    public BroadcastHelper broadcastHelper;

    public AppDataHelper appDataHelper;

    public InstallPackageHelper installPackageHelper;

    public RemovePackageHelper removePackageHelper;

    public InitAndSystemPackageHelper initAndSystemPackageHelper;

    public DeletePackageHelper deletePackageHelper;

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

+91 −0
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@ package com.android.server.pm; 


import static android.content.pm.PackageManager.INSTALL_FAILED_SHARED_USER_INCOMPATIBLE;

import static android.content.pm.PackageManager.INSTALL_FAILED_UPDATE_INCOMPATIBLE;

import static android.content.pm.PackageManager.INSTALL_FAILED_VERSION_DOWNGRADE;

import static android.system.OsConstants.O_CREAT;

import static android.system.OsConstants.O_RDWR;



import static com.android.internal.content.NativeLibraryHelper.LIB_DIR_NAME;

import static com.android.server.pm.PackageManagerService.COMPRESSED_EXTENSION;

import static com.android.server.pm.PackageManagerService.DEBUG_COMPRESSION;

import static com.android.server.pm.PackageManagerService.DEBUG_INTENT_MATCHING;
@@ -60,6 +62,7 @@ import android.os.FileUtils; 
import android.os.Process;

import android.os.SystemProperties;

import android.os.incremental.IncrementalManager;

import android.os.incremental.IncrementalStorage;

import android.os.incremental.V4Signature;

import android.os.incremental.V4Signature.HashingInfo;

import android.os.storage.DiskInfo;
@@ -84,6 +87,7 @@ import com.android.internal.util.FastPrintWriter; 
import com.android.internal.util.HexDump;

import com.android.server.EventLogTags;

import com.android.server.IntentResolver;

import com.android.server.Watchdog;

import com.android.server.compat.PlatformCompat;

import com.android.server.pm.dex.PackageDexUsage;

import com.android.server.pm.parsing.pkg.AndroidPackage;
@@ -648,6 +652,58 @@ public class PackageManagerServiceUtils { 
        return compatMatch;

    }



    /**

     * Extract native libraries to a target path

     */

    public static int extractNativeBinaries(File dstCodePath, String packageName) {

        final File libraryRoot = new File(dstCodePath, LIB_DIR_NAME);

        NativeLibraryHelper.Handle handle = null;

        try {

            handle = NativeLibraryHelper.Handle.create(dstCodePath);

            return NativeLibraryHelper.copyNativeBinariesWithOverride(handle, libraryRoot,

                    null /*abiOverride*/, false /*isIncremental*/);

        } catch (IOException e) {

            logCriticalInfo(Log.ERROR, "Failed to extract native libraries"

                    + "; pkg: " + packageName);

            return PackageManager.INSTALL_FAILED_INTERNAL_ERROR;

        } finally {

            IoUtils.closeQuietly(handle);

        }

    }



    /**

     * Remove native libraries of a given package

     */

    public static void removeNativeBinariesLI(PackageSetting ps) {

        if (ps != null) {

            NativeLibraryHelper.removeNativeBinariesLI(ps.getLegacyNativeLibraryPath());

        }

    }



    /**

     * Wait for native library extraction to be done in IncrementalService

     */

    public static void waitForNativeBinariesExtractionForIncremental(

            ArraySet<IncrementalStorage> incrementalStorages) {

        if (incrementalStorages.isEmpty()) {

            return;

        }

        try {

            // Native library extraction may take very long time: each page could potentially

            // wait for either 10s or 100ms (adb vs non-adb data loader), and that easily adds

            // up to a full watchdog timeout of 1 min, killing the system after that. It doesn't

            // make much sense as blocking here doesn't lock up the framework, but only blocks

            // the installation session and the following ones.

            Watchdog.getInstance().pauseWatchingCurrentThread("native_lib_extract");

            for (int i = 0; i < incrementalStorages.size(); ++i) {

                IncrementalStorage storage = incrementalStorages.valueAtUnchecked(i);

                storage.waitForNativeBinariesExtraction();

            }

        } finally {

            Watchdog.getInstance().resumeWatchingCurrentThread("native_lib_extract");

        }

    }



    /**

     * Decompress files stored in codePath to dstCodePath for a certain package.

     */
@@ -1280,4 +1336,39 @@ public class PackageManagerServiceUtils { 


        return cacheDir;

    }



    /**

     * Check and throw if the given before/after packages would be considered a

     * downgrade.

     */

    public static void checkDowngrade(AndroidPackage before, PackageInfoLite after)

            throws PackageManagerException {

        if (after.getLongVersionCode() < before.getLongVersionCode()) {

            throw new PackageManagerException(INSTALL_FAILED_VERSION_DOWNGRADE,

                    "Update version code " + after.versionCode + " is older than current "

                            + before.getLongVersionCode());

        } else if (after.getLongVersionCode() == before.getLongVersionCode()) {

            if (after.baseRevisionCode < before.getBaseRevisionCode()) {

                throw new PackageManagerException(INSTALL_FAILED_VERSION_DOWNGRADE,

                        "Update base revision code " + after.baseRevisionCode

                                + " is older than current " + before.getBaseRevisionCode());

            }



            if (!ArrayUtils.isEmpty(after.splitNames)) {

                for (int i = 0; i < after.splitNames.length; i++) {

                    final String splitName = after.splitNames[i];

                    final int j = ArrayUtils.indexOf(before.getSplitNames(), splitName);

                    if (j != -1) {

                        if (after.splitRevisionCodes[i] < before.getSplitRevisionCodes()[j]) {

                            throw new PackageManagerException(INSTALL_FAILED_VERSION_DOWNGRADE,

                                    "Update split " + splitName + " revision code "

                                            + after.splitRevisionCodes[i]

                                            + " is older than current "

                                            + before.getSplitRevisionCodes()[j]);

                        }

                    }

                }

            }

        }

    }

}