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

Commit a0482506 authored by Songchun Fan's avatar Songchun Fan Committed by Android (Google) Code Review
Browse files

Merge changes Id5624b02,I9f93cc36 

* changes:
  [pm] add IBackupManager to the pm injector
  [pm] move mPm related code from ScanPackageHelper to InstallPackageHelper
parents db096528 71328b28

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

+824 −411

File changed.

Preview size limit exceeded, changes collapsed.

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

+10 −39
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.app.ApplicationPackageManager; 
import android.app.IActivityManager;

import android.app.admin.IDevicePolicyManager;

import android.app.admin.SecurityLog;

import android.app.backup.IBackupManager;

import android.app.role.RoleManager;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledAfter;
@@ -582,13 +583,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 +969,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;
@@ -1525,7 +1520,9 @@ public class PackageManagerService extends IPackageManager.Stub 
                new DefaultSystemWrapper(),

                LocalServices::getService,

                context::getSystemService,

                (i, pm) -> new BackgroundDexOptService(i.getContext(), i.getDexManager(), pm));

                (i, pm) -> new BackgroundDexOptService(i.getContext(), i.getDexManager(), pm),

                (i, pm) -> IBackupManager.Stub.asInterface(ServiceManager.getService(

                        Context.BACKUP_SERVICE)));



        if (Build.VERSION.SDK_INT <= 0) {

            Slog.w(TAG, "**** ro.build.version.sdk not set!");
@@ -1697,7 +1694,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 +1701,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 +1834,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 +1841,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 +2003,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 +4695,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 +6705,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/PackageManagerServiceInjector.java

+9 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.pm;



import android.app.ActivityManagerInternal;

import android.app.backup.IBackupManager;

import android.content.ComponentName;

import android.content.Context;

import android.os.Handler;
@@ -135,6 +136,7 @@ public class PackageManagerServiceInjector { 
            mDomainVerificationManagerInternalProducer;

    private final Singleton<Handler> mHandlerProducer;

    private final Singleton<BackgroundDexOptService> mBackgroundDexOptService;

    private final Singleton<IBackupManager> mIBackupManager;



    PackageManagerServiceInjector(Context context, PackageManagerTracedLock lock,

            Installer installer, Object installLock, PackageAbiHelper abiHelper,
@@ -170,7 +172,8 @@ public class PackageManagerServiceInjector { 
            SystemWrapper systemWrapper,

            ServiceProducer getLocalServiceProducer,

            ServiceProducer getSystemServiceProducer,

            Producer<BackgroundDexOptService> backgroundDexOptService) {

            Producer<BackgroundDexOptService> backgroundDexOptService,

            Producer<IBackupManager> iBackupManager) {

        mContext = context;

        mLock = lock;

        mInstaller = installer;
@@ -220,6 +223,7 @@ public class PackageManagerServiceInjector { 
                        domainVerificationManagerInternalProducer);

        mHandlerProducer = new Singleton<>(handlerProducer);

        mBackgroundDexOptService = new Singleton<>(backgroundDexOptService);

        mIBackupManager = new Singleton<>(iBackupManager);

    }



    /**
@@ -384,6 +388,10 @@ public class PackageManagerServiceInjector { 
        return mBackgroundDexOptService.get(this, mPackageManager);

    }



    public IBackupManager getIBackupManager() {

        return mIBackupManager.get(this, mPackageManager);

    }



    /** Provides an abstraction to static access to system state. */

    public interface SystemWrapper {

        void disablePackageCaches();

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;