diff options
| author | 2022-07-28 00:57:26 +0000 | |
|---|---|---|
| committer | 2022-07-28 00:57:26 +0000 | |
| commit | 7b77eb23e96d5ddb04dfdcc993a0461907cdd967 (patch) | |
| tree | f6b139c38f29f743ca836276de7704c8197d06a2 | |
| parent | 952814e3df008772a48559e4dcccffcb0ba9b4e9 (diff) | |
| parent | 92a6541de9357c24b26d0b1657bce66fb8296746 (diff) | |
Merge "Set scan flags correctly for preloaded applications" into tm-qpr-dev am: 92a6541de9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19431256
Change-Id: I96ccc1a27f35c3b7ba5b79b2059958372182f7b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/InitAppsHelper.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/InitAppsHelper.java b/services/core/java/com/android/server/pm/InitAppsHelper.java index f6b22bc38939..a03a16ad7bc3 100644 --- a/services/core/java/com/android/server/pm/InitAppsHelper.java +++ b/services/core/java/com/android/server/pm/InitAppsHelper.java @@ -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(); } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 94e8ec5c434d..85b01491a8b7 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -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; |