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

Commit 2ee62d08 authored by Victor Hsieh's avatar Victor Hsieh
Browse files

Restore the check of fs-verity status 

IncFs v1 does not support fs-verity. The original condition before
ag/20327155 allowed a split to be installed without .fsv_sig, but ag/
ag/20327155 changes the expectation. To maintain the behavior, still
check the fs-verity-ness in addition.

Bug: 257775576
Test: abtd
Change-Id: If0a87b2ef4ad2e4c4920dbd17d1591b021f470d1
parent c2665dd8

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

+1 −0
Original line number Diff line number Diff line
@@ -2782,6 +2782,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        // 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();