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

Commit 8a6f4616 authored by Songchun Fan's avatar Songchun Fan
Browse files

[pm] consolidate part of InitAndSystemPackageHelper 

+ Also moves out mExpectingBetter
+ Make some fields private again (that were made public in previous
refactoring)

BUG: 197876467
BUG: 197869066
Test: manual
Change-Id: Iac69dbb61e395117dec0666650a967822d7bbd71
parent bc3291d1

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

+2 −1
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ final class AppDataHelper { 
                    // #performDexOptUpgrade. When we do that we should have a

                    // more granular check here and only update the existing

                    // profiles.

                    if (mPm.mIsUpgrade || mPm.mFirstBoot || (userId != UserHandle.USER_SYSTEM)) {

                    if (mPm.isDeviceUpgrading() || mPm.isFirstBoot()

                            || (userId != UserHandle.USER_SYSTEM)) {

                        mArtManagerService.prepareAppProfiles(pkg, userId,

                                /* updateReferenceProfileContent= */ false);

                    }

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

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public final class ComputerLocked extends ComputerEngine { 
        return mService.mInstantAppInstallerActivity;

    }

    protected ApplicationInfo androidApplication() {

        return mService.mAndroidApplication;

        return mService.getCoreAndroidApplication();

    }



    public @NonNull List<ResolveInfo> queryIntentServicesInternalBody(Intent intent,

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

+4 −6
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ final class DeletePackageHelper { 
    private final UserManagerInternal mUserManagerInternal;

    private final PermissionManagerServiceInternal mPermissionManager;

    private final RemovePackageHelper mRemovePackageHelper;

    // TODO(b/201815903): remove dependency to InitAndSystemPackageHelper

    private final InitAndSystemPackageHelper mInitAndSystemPackageHelper;

    private final AppDataHelper mAppDataHelper;
@@ -104,8 +105,7 @@ final class DeletePackageHelper { 
        mUserManagerInternal = mPm.mInjector.getUserManagerInternal();

        mPermissionManager = mPm.mInjector.getPermissionManagerServiceInternal();

        mRemovePackageHelper = new RemovePackageHelper(mPm, mAppDataHelper);

        mInitAndSystemPackageHelper = new InitAndSystemPackageHelper(mPm, mRemovePackageHelper,

                mAppDataHelper);

        mInitAndSystemPackageHelper = mPm.getInitAndSystemPackageHelper();

    }



    /**
@@ -282,8 +282,7 @@ final class DeletePackageHelper { 
                            Slog.i(TAG, "Enabling system stub after removal; pkg: "

                                    + stubPkg.getPackageName());

                        }

                        mInitAndSystemPackageHelper.enableCompressedPackage(stubPkg, stubPs,

                                mPm.mDefParseFlags, mPm.getDirsToScanAsSystem());

                        mInitAndSystemPackageHelper.enableCompressedPackage(stubPkg, stubPs);

                    } else if (DEBUG_COMPRESSION) {

                        Slog.i(TAG, "System stub disabled for all users, leaving uncompressed "

                                + "after removal; pkg: " + stubPkg.getPackageName());
@@ -424,8 +423,7 @@ final class DeletePackageHelper { 
            PackageSetting disabledPs = deleteInstalledSystemPackage(action, ps, allUserHandles,

                    flags, outInfo, writeSettings);

            mInitAndSystemPackageHelper.restoreDisabledSystemPackageLIF(

                    action, ps, allUserHandles, outInfo, writeSettings, mPm.mDefParseFlags,

                    mPm.getDirsToScanAsSystem(), disabledPs);

                    action, ps, allUserHandles, outInfo, writeSettings, disabledPs);

        } else {

            if (DEBUG_REMOVE) Slog.d(TAG, "Removing non-system package: " + ps.getPackageName());

            deleteInstalledPackageLIF(ps, deleteCodeAndResources, flags, allUserHandles,

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

+2 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ final class DexOptHelper { 
        // First boot or factory reset.

        // Note: we also handle devices that are upgrading to N right now as if it is their

        //       first boot, as they do not have profile data.

        boolean causeFirstBoot = mPm.isFirstBoot() || mPm.mIsPreNUpgrade;

        boolean causeFirstBoot = mPm.isFirstBoot() || mPm.isPreNUpgrade();



        if (!causeUpgrade && !causeFirstBoot) {

            return;
@@ -272,7 +272,7 @@ final class DexOptHelper { 
        }



        final long startTime = System.nanoTime();

        final int[] stats = performDexOptUpgrade(pkgs, mPm.mIsPreNUpgrade /* showDialog */,

        final int[] stats = performDexOptUpgrade(pkgs, mPm.isPreNUpgrade() /* showDialog */,

                causeFirstBoot ? REASON_FIRST_BOOT : REASON_BOOT_AFTER_OTA,

                false /* bootComplete */);

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

+141 −75

File changed.

Preview size limit exceeded, changes collapsed.