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

Commit ed70e4de authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Set scan flags correctly for preloaded applications"

parents 222a476a 73d44868

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

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ final class InitAppsHelper { 
            mScanFlags = scanFlags;

        }

        mSystemParseFlags = mPm.getDefParseFlags() | ParsingPackageUtils.PARSE_IS_SYSTEM_DIR;

        mSystemScanFlags = scanFlags | SCAN_AS_SYSTEM;

        mSystemScanFlags = mScanFlags | SCAN_AS_SYSTEM;

        mExecutorService = ParallelPackageParser.makeExecutorService();

    }

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

+3 −2
Original line number Diff line number Diff line
@@ -1836,8 +1836,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
        mAppDataHelper = new AppDataHelper(this);

        mInstallPackageHelper = new InstallPackageHelper(this, mAppDataHelper);

        mRemovePackageHelper = new RemovePackageHelper(this, mAppDataHelper);

        mInitAppsHelper = new InitAppsHelper(this, mApexManager, mInstallPackageHelper,

                mInjector.getSystemPartitions());

        mDeletePackageHelper = new DeletePackageHelper(this, mRemovePackageHelper,

                mAppDataHelper);

        mSharedLibraries.setDeletePackageHelper(mDeletePackageHelper);
@@ -1958,6 +1956,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
                        + ver.fingerprint + " to " + PackagePartitions.FINGERPRINT);

            }



            mInitAppsHelper = new InitAppsHelper(this, mApexManager, mInstallPackageHelper,

                mInjector.getSystemPartitions());



            // when upgrading from pre-M, promote system app permissions from install to runtime

            mPromoteSystemApps =

                    mIsUpgrade && ver.sdkVersion <= Build.VERSION_CODES.LOLLIPOP_MR1;