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

Commit c6f0fa25 authored by Victor Hsieh's avatar Victor Hsieh Committed by Android (Google) Code Review
Browse files

Revert "Enable fs-verity in background thread" 

This reverts commit 03a0c6c7.

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

Change-Id: Ib42d136549284765deb9d17cbbf409738f844d73
parent 03a0c6c7

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

+12 −18
Original line number Diff line number Diff line
@@ -2228,10 +2228,6 @@ 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);
@@ -2246,8 +2242,6 @@ 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);