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

Revert "Enable fs-verity in background thread"

Browse Source 
This reverts commit 03a0c6c737.

Reason for revert: b/260856890. Possible race condition: test calls ApkChecksum before the setup is completed.

Change-Id: Ib42d136549284765deb9d17cbbf409738f844d73
This commit is contained in:
Victor Hsieh
2022-11-30 19:08:43 +00:00
committed by Android (Google) Code Review
parent 03a0c6c737
commit c6f0fa25cc
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2228,26 +2228,20 @@ final class InstallPackageHelper {
incrementalStorages.add(storage);
}
// Enabling fs-verity is a blocking operation. To reduce the impact to the install time,
// run in a background thread.
new Thread("fsverity-setup") {
@Override public void run() {
try {
if (!VerityUtils.hasFsverity(pkg.getBaseApkPath())) {
VerityUtils.setUpFsverity(pkg.getBaseApkPath(), (byte[]) null);
}
for (String path : pkg.getSplitCodePaths()) {
if (!VerityUtils.hasFsverity(path)) {
VerityUtils.setUpFsverity(path, (byte[]) null);
}
}
} 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 " + packageName);
try {
if (!VerityUtils.hasFsverity(pkg.getBaseApkPath())) {
VerityUtils.setUpFsverity(pkg.getBaseApkPath(), (byte[]) null);
}
for (String path : pkg.getSplitCodePaths()) {
if (!VerityUtils.hasFsverity(path)) {
VerityUtils.setUpFsverity(path, (byte[]) null);
}
}
}.start();
} 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 " + packageName);
}
// Hardcode previousAppId to 0 to disable any data migration (http://b/221088088)
mAppDataHelper.prepareAppDataPostCommitLIF(pkg, 0);