Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set scan flags correctly for preloaded applications" into tm-qpr-dev

Browse Source
This commit is contained in:
Songchun Fan
2022-07-28 00:36:27 +00:00
committed by Android (Google) Code Review
parent 33cd58dc9a aafec8565e
commit 92a6541de9
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/InitAppsHelper.java
View File

@@ -113,7 +113,7 @@ final class InitAppsHelper {
mScanFlags = scanFlags; mScanFlags = scanFlags;
} }
mSystemParseFlags = mPm.getDefParseFlags() | ParsingPackageUtils.PARSE_IS_SYSTEM_DIR; mSystemParseFlags = mPm.getDefParseFlags() | ParsingPackageUtils.PARSE_IS_SYSTEM_DIR;
mSystemScanFlags = scanFlags | SCAN_AS_SYSTEM; mSystemScanFlags = mScanFlags | SCAN_AS_SYSTEM;
mExecutorService = ParallelPackageParser.makeExecutorService(); mExecutorService = ParallelPackageParser.makeExecutorService();
} }

5
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -1836,8 +1836,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService
mAppDataHelper = new AppDataHelper(this); mAppDataHelper = new AppDataHelper(this);
mInstallPackageHelper = new InstallPackageHelper(this, mAppDataHelper); mInstallPackageHelper = new InstallPackageHelper(this, mAppDataHelper);
mRemovePackageHelper = new RemovePackageHelper(this, mAppDataHelper); mRemovePackageHelper = new RemovePackageHelper(this, mAppDataHelper);
mInitAppsHelper = new InitAppsHelper(this, mApexManager, mInstallPackageHelper,
mInjector.getSystemPartitions());
mDeletePackageHelper = new DeletePackageHelper(this, mRemovePackageHelper, mDeletePackageHelper = new DeletePackageHelper(this, mRemovePackageHelper,
mAppDataHelper); mAppDataHelper);
mSharedLibraries.setDeletePackageHelper(mDeletePackageHelper); mSharedLibraries.setDeletePackageHelper(mDeletePackageHelper);
@@ -1958,6 +1956,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService
+ ver.fingerprint + " to " + PackagePartitions.FINGERPRINT); + 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 // when upgrading from pre-M, promote system app permissions from install to runtime
mPromoteSystemApps = mPromoteSystemApps =
mIsUpgrade && ver.sdkVersion <= Build.VERSION_CODES.LOLLIPOP_MR1; mIsUpgrade && ver.sdkVersion <= Build.VERSION_CODES.LOLLIPOP_MR1;