Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71c085d4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Enable fs-verity in background thread"

parents 28b62162 03a0c6c7
Loading
Loading
Loading
Loading
+18 −12
Original line number Diff line number Diff line
@@ -2259,6 +2259,10 @@ 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);
@@ -2273,6 +2277,8 @@ final class InstallPackageHelper {
                        // optional, just ignore the error for now.
                        Slog.e(TAG, "Failed to fully enable fs-verity to " + packageName);
                    }
                }
            }.start();

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