Merge "Revert "Enable fs-verity in background thread"" (627b85d9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/InstallPackageHelper.java

+12 −18

Original line number	Original line	Diff line number	Diff line
	@@ -2259,10 +2259,6 @@ final class InstallPackageHelper {
	incrementalStorages.add(storage);		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 {		try {
	if (!VerityUtils.hasFsverity(pkg.getBaseApkPath())) {		if (!VerityUtils.hasFsverity(pkg.getBaseApkPath())) {
	VerityUtils.setUpFsverity(pkg.getBaseApkPath(), (byte[]) null);		VerityUtils.setUpFsverity(pkg.getBaseApkPath(), (byte[]) null);
	@@ -2277,8 +2273,6 @@ final class InstallPackageHelper {
	// optional, just ignore the error for now.		// optional, just ignore the error for now.
	Slog.e(TAG, "Failed to fully enable fs-verity to " + packageName);		Slog.e(TAG, "Failed to fully enable fs-verity to " + packageName);
	}		}
	}
	}.start();

	// Hardcode previousAppId to 0 to disable any data migration (http://b/221088088)		// Hardcode previousAppId to 0 to disable any data migration (http://b/221088088)
	mAppDataHelper.prepareAppDataPostCommitLIF(pkg, 0);		mAppDataHelper.prepareAppDataPostCommitLIF(pkg, 0);