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

Commit 4a9d05c0 authored by Priyanka Advani's avatar Priyanka Advani
Browse files

Revert "Deprecate .fsv_sig" 

Revert submission 24590927-deprecate_fsv_sig

Reason for revert: b/299494922

Reverted changes: /q/submissionid:24590927-deprecate_fsv_sig

Change-Id: I1ecc3ea2a1387b92e98ebdea225476989d08b599
parent 719161ad

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

+0 −3
Original line number Diff line number Diff line
@@ -3588,9 +3588,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
    @GuardedBy("mLock")

    private void maybeStageFsveritySignatureLocked(File origFile, File targetFile,

            boolean fsVerityRequired) throws PackageManagerException {

        if (com.android.server.security.Flags.deprecateFsvSig()) {

            return;

        }

        final File originalSignature = new File(

                VerityUtils.getFsveritySignatureFilePath(origFile.getPath()));

        if (originalSignature.exists()) {

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

+0 −3
Original line number Diff line number Diff line
@@ -543,9 +543,6 @@ public class PackageManagerServiceUtils { 


    /** Returns true if standard APK Verity is enabled. */

    static boolean isApkVerityEnabled() {

        if (com.android.server.security.Flags.deprecateFsvSig()) {

            return false;

        }

        return Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.R

                || SystemProperties.getInt("ro.apk_verity.mode", FSVERITY_DISABLED)

                        == FSVERITY_ENABLED;