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

Merge changes from topic "presubmit-am-2355cba6040b4ac28f66e83feb674a33" into tm-mainline-prod

Browse Source 
* changes:
  [automerge] Optimize EROFS detection code. 2p: 135ac09990
  Optimize EROFS detection code.
This commit is contained in:
David Anderson
2022-04-07 04:17:16 +00:00
committed by Android (Google) Code Review
parent cd11bad9fe 0cb75bd2c8
commit 12670f2bca
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/com/android/server/SystemConfig.java
View File

@@ -59,7 +59,6 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -1487,7 +1486,7 @@ public class SystemConfig {
addFeature(PackageManager.FEATURE_IPSEC_TUNNELS, 0);
}
if (isFilesystemSupported("erofs")) {
if (isErofsSupported()) {
if (isKernelVersionAtLeast(5, 10)) {
addFeature(PackageManager.FEATURE_EROFS, 0);
} else if (isKernelVersionAtLeast(4, 19)) {
@@ -1865,11 +1864,10 @@ public class SystemConfig {
return Process.myUid() == Process.SYSTEM_UID;
}
private static boolean isFilesystemSupported(String fs) {
private static boolean isErofsSupported() {
try {
final byte[] fsTableData = Files.readAllBytes(Paths.get("/proc/filesystems"));
final String fsTable = new String(fsTableData, StandardCharsets.UTF_8);
return fsTable.contains("\t" + fs + "\n");
final Path path = Paths.get("/sys/fs/erofs");
return Files.exists(path);
} catch (Exception e) {
return false;
}