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

Merge "Replace incomplete path-based check with statx"

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-01 16:28:41 +00:00
committed by Gerrit Code Review
parent fef900767d 2353f4cfec
commit 0791285a86
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/pm/ApkChecksums.java
View File

@@ -40,8 +40,6 @@ import android.content.pm.SigningDetails.SignatureSchemeVersion;
import android.content.pm.parsing.ApkLiteParseUtils; import android.content.pm.parsing.ApkLiteParseUtils;
import android.content.pm.parsing.result.ParseResult; import android.content.pm.parsing.result.ParseResult;
import android.content.pm.parsing.result.ParseTypeImpl; import android.content.pm.parsing.result.ParseTypeImpl;
import android.os.Environment;
import android.os.FileUtils;
import android.os.Handler; import android.os.Handler;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.SystemClock; import android.os.SystemClock;
@@ -638,18 +636,9 @@ public class ApkChecksums {
return null; return null;
} }
private static boolean containsFile(File dir, String filePath) {
if (dir == null) {
return false;
}
return FileUtils.contains(dir.getAbsolutePath(), filePath);
}
private static ApkChecksum extractHashFromFS(String split, String filePath) { private static ApkChecksum extractHashFromFS(String split, String filePath) {
// verity first // verity first
// Skip /product folder. if (VerityUtils.hasFsverity(filePath)) {
// TODO(b/231354111): remove this hack once we are allowed to change SELinux rules.
if (!containsFile(Environment.getProductDirectory(), filePath)) {
byte[] verityHash = VerityUtils.getFsverityDigest(filePath); byte[] verityHash = VerityUtils.getFsverityDigest(filePath);
if (verityHash != null) { if (verityHash != null) {
return new ApkChecksum(split, TYPE_WHOLE_MERKLE_ROOT_4K_SHA256, verityHash); return new ApkChecksum(split, TYPE_WHOLE_MERKLE_ROOT_4K_SHA256, verityHash);