Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alex Buynytskyy
2021-03-05 21:39:26 +00:00
committed by Android (Google) Code Review
parent 4379d99c29 e8533f9194
commit 18a94794d6
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/incremental/IncrementalManager.java
View File

@@ -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 =

5
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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) {