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

Don't add APEX keysets to KeySetManagerService

Browse Source 
There are orphaned keysets during boot because APEX package
settings are not persisted.

This will also improve boot time as we don't create keysets
for APEX.

Bug: 225756739
Test: presubmit
Change-Id: I7b781b26b45d0e08be9a1e8750dbee2b2c5fdb6f
This commit is contained in:
JW Wang
2022-07-06 16:39:57 +08:00
parent 8bc7ad63d3
commit 0cec718059
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/InstallPackageHelper.java
View File

@@ -473,9 +473,13 @@ final class InstallPackageHelper {
mApexManager.registerApkInApex(pkg);
}
// Add the package's KeySets to the global KeySetManagerService
KeySetManagerService ksms = mPm.mSettings.getKeySetManagerService();
ksms.addScannedPackageLPw(pkg);
// Don't add keysets for APEX as their package settings are not persisted and will
// result in orphaned keysets.
if ((scanFlags & SCAN_AS_APEX) == 0) {
// Add the package's KeySets to the global KeySetManagerService
KeySetManagerService ksms = mPm.mSettings.getKeySetManagerService();
ksms.addScannedPackageLPw(pkg);
}
final Computer snapshot = mPm.snapshotComputer();
mPm.mComponentResolver.addAllComponents(pkg, chatty, mPm.mSetupWizardPackage, snapshot);