Merge "Restore the check of fs-verity status"

2022-12-13 23:10:29 +00:00
parent e6cf58ac7c 2ee62d082a
commit 2d096185e5
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -2785,6 +2785,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();