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

Merge "BinaryTransparencyService: Fix getOriginalApexPreinstalledLocation"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-11-29 23:38:53 +00:00
committed by Android (Google) Code Review
parent 0e2fdeaa74 000011116f
commit be983bc36f
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/BinaryTransparencyService.java
View File

@@ -73,6 +73,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* @hide
@@ -104,6 +105,9 @@ public class BinaryTransparencyService extends SystemService {
@VisibleForTesting
static final String BUNDLE_CONTENT_DIGEST = "content-digest";
static final String APEX_PRELOAD_LOCATION = "/system/apex/";
static final String APEX_PRELOAD_LOCATION_ERROR = "could-not-be-determined";
// used for indicating any type of error during MBA measurement
static final int MBA_STATUS_ERROR = 0;
// used for indicating factory condition preloads
@@ -1110,18 +1114,22 @@ public class BinaryTransparencyService extends SystemService {
}
}
// TODO(b/259349011): Need to be more robust against package name mismatch in the filename
@NonNull
private String getOriginalApexPreinstalledLocation(String packageName,
String currentInstalledLocation) {
if (currentInstalledLocation.contains("/decompressed/")) {
String resultPath = "system/apex" + packageName + ".capex";
File f = new File(resultPath);
if (f.exists()) {
return resultPath;
// get a listing of all apex files in /system/apex/
Set<String> originalApexs = Stream.of(new File(APEX_PRELOAD_LOCATION).listFiles())
.filter(f -> !f.isDirectory())
.map(File::getName)
.collect(Collectors.toSet());
for (String originalApex : originalApexs) {
if (originalApex.startsWith(packageName)) {
return APEX_PRELOAD_LOCATION + originalApex;
}
return "/system/apex/" + packageName + ".next.capex";
}
return "/system/apex" + packageName + "apex";
return APEX_PRELOAD_LOCATION_ERROR;
}
/**