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

Merge "Revert fs-verity for all APKs"

Browse Source
This commit is contained in:
Victor Hsieh
2023-01-18 16:06:40 +00:00
committed by Android (Google) Code Review
parent dff6a36ce2 76a3e5480b
commit 12917797fc
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2325,7 +2325,6 @@ final class InstallPackageHelper {
@GuardedBy("mPm.mInstallLock")
private void executePostCommitStepsLIF(List<ReconciledPackage> reconciledPackages) {
final ArraySet<IncrementalStorage> incrementalStorages = new ArraySet<>();
final ArrayList<String> apkPaths = new ArrayList<>();
for (ReconciledPackage reconciledPkg : reconciledPackages) {
final InstallRequest installRequest = reconciledPkg.mInstallRequest;
final boolean instantApp = ((installRequest.getScanFlags() & SCAN_AS_INSTANT_APP) != 0);
@@ -2344,13 +2343,6 @@ final class InstallPackageHelper {
incrementalStorages.add(storage);
}
// Enabling fs-verity is a blocking operation. To reduce the impact to the install time,
// collect the files to later enable in a background thread.
apkPaths.add(pkg.getBaseApkPath());
if (pkg.getSplitCodePaths() != null) {
Collections.addAll(apkPaths, pkg.getSplitCodePaths());
}
// Hardcode previousAppId to 0 to disable any data migration (http://b/221088088)
mAppDataHelper.prepareAppDataPostCommitLIF(pkg, 0);
if (installRequest.isClearCodeCache()) {
@@ -2479,20 +2471,6 @@ final class InstallPackageHelper {
}
PackageManagerServiceUtils.waitForNativeBinariesExtractionForIncremental(
incrementalStorages);
mInjector.getBackgroundHandler().post(() -> {
for (String path : apkPaths) {
if (!VerityUtils.hasFsverity(path)) {
try {
VerityUtils.setUpFsverity(path);
} catch (IOException e) {
// There's nothing we can do if the setup failed. Since fs-verity is
// optional, just ignore the error for now.
Slog.e(TAG, "Failed to fully enable fs-verity to " + path);
}
}
}
});
}
Pair<Integer, String> verifyReplacingVersionCode(PackageInfoLite pkgLite,