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

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

Merge "Replace the check of fs-verity-ness to signature file"

parents f571b44f d52181a0
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -2763,10 +2763,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
                    "Missing existing base package");
        }

        // Default to require only if existing base apk has fs-verity.
        // Default to require only if existing base apk has fs-verity signature.
        mVerityFoundForApks = PackageManagerServiceUtils.isApkVerityEnabled()
                && params.mode == SessionParams.MODE_INHERIT_EXISTING
                && VerityUtils.hasFsverity(pkgInfo.applicationInfo.getBaseCodePath());
                && (new File(VerityUtils.getFsveritySignatureFilePath(
                        pkgInfo.applicationInfo.getBaseCodePath()))).exists();

        final List<File> removedFiles = getRemovedFilesLocked();
        final List<String> removeSplitList = new ArrayList<>();