Merge "Add /apex to the list of allowed SystemServer paths" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-04-10 19:52:26 +00:00
committed by Android (Google) Code Review

View File

@@ -232,6 +232,10 @@ public class DexManager {
private boolean isSystemServerDexPathSupportedForOdex(String dexPath) { private boolean isSystemServerDexPathSupportedForOdex(String dexPath) {
ArrayList<PackagePartitions.SystemPartition> partitions = ArrayList<PackagePartitions.SystemPartition> partitions =
PackagePartitions.getOrderedPartitions(identity()); PackagePartitions.getOrderedPartitions(identity());
// First check the apex partition as it's not part of the SystemPartitions.
if (dexPath.startsWith("/apex/")) {
return true;
}
for (int i = 0; i < partitions.size(); i++) { for (int i = 0; i < partitions.size(); i++) {
if (partitions.get(i).containsPath(dexPath)) { if (partitions.get(i).containsPath(dexPath)) {
return true; return true;