Merge "Reland: Enable fs-verity in background thread"

                incrementalStorages.add(storage);

            }

            // Enabling fs-verity is a blocking operation. To reduce the impact to the install time,

            // run in a background thread.

            final ArrayList<String> apkPaths = new ArrayList<>();

            apkPaths.add(pkg.getBaseApkPath());

            if (pkg.getSplitCodePaths() != null) {

                Collections.addAll(apkPaths, pkg.getSplitCodePaths());

            }

            mInjector.getBackgroundHandler().post(() -> {

                try {

                if (!VerityUtils.hasFsverity(pkg.getBaseApkPath())) {

                    VerityUtils.setUpFsverity(pkg.getBaseApkPath(), (byte[]) null);

                }

                for (String path : pkg.getSplitCodePaths()) {

                    for (String path : apkPaths) {

                        if (!VerityUtils.hasFsverity(path)) {

                            VerityUtils.setUpFsverity(path, (byte[]) null);

                        }

                    // 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);