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

Commit 18a94794 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Merge "Check if IncFs supports fs-verity before trying to enable it." into sc-dev

parents 4379d99c e8533f91

core/java/android/os/incremental/IncrementalManager.java

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ public final class IncrementalManager { 


    private static final String ALLOWED_PROPERTY = "incremental.allowed";



    public static final int MIN_VERSION_TO_SUPPORT_FSVERITY = 2;



    public static final int CREATE_MODE_TEMPORARY_BIND =

            IIncrementalService.CREATE_MODE_TEMPORARY_BIND;

    public static final int CREATE_MODE_PERMANENT_BIND =

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

+5 −0
Original line number Diff line number Diff line
@@ -20368,6 +20368,11 @@ public class PackageManagerService extends IPackageManager.Stub 
            return;

        }













        if (isIncrementalPath(pkg.getPath()) && IncrementalManager.getVersion()













                < IncrementalManager.MIN_VERSION_TO_SUPPORT_FSVERITY) {













            return;













        }



























        // Collect files we care for fs-verity setup.















        ArrayMap<String, String> fsverityCandidates = new ArrayMap<>();















        if (legacyMode) {