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

Commit d4b9d78f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Only stage .idsig if fs-verity is supported" into main

parents ffca9a61 d85b7403

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

+3 −2
Original line number Diff line number Diff line
@@ -3817,8 +3817,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        // Stage APK's fs-verity signature if present.

        maybeStageFsveritySignatureLocked(origFile, targetFile,

                isFsVerityRequiredForApk(origFile, targetFile));

        // Stage APK's v4 signature if present.

        if (android.security.Flags.extendVbChainToUpdatedApk()) {

        // Stage APK's v4 signature if present, and fs-verity is supported.

        if (android.security.Flags.extendVbChainToUpdatedApk()

                && VerityUtils.isFsVeritySupported()) {

            maybeStageV4SignatureLocked(origFile, targetFile);

        }

        // Stage dex metadata (.dm) and corresponding fs-verity signature if present.