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

Remove special case for com.android.art.release, which no longer exists.

Browse Source 
Test: `m droid com.android.art{,.debug}` and boot in Cuttlefish
  with and without OVERRIDE_TARGET_FLATTEN_APEX=true
Bug: 169639321
Change-Id: I7581ab2a99822a6e80e158ae58ffc4b6c82f0f99
This commit is contained in:
Martin Stjernholm
2020-10-27 21:58:05 +00:00
parent dd9cc9f4cc
commit dbee03c575
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/pm/ApexManager.java
View File

@@ -1018,29 +1018,17 @@ public abstract class ApexManager {
// the /apex directory is just a symlink to /system/apex.
List<ActiveApexInfo> result = new ArrayList<>();
File apexDir = Environment.getApexDirectory();
// In flattened configuration, init special-case the art directory and bind-mounts
// com.android.art.{release|debug} to com.android.art. At the time of writing, these
// directories are copied from the kArtApexDirNames variable in
// system/core/init/mount_namespace.cpp.
String[] skipDirs = {"com.android.art.release", "com.android.art.debug"};
if (apexDir.isDirectory()) {
File[] files = apexDir.listFiles();
// listFiles might be null if system server doesn't have permission to read
// a directory.
if (files != null) {
for (File file : files) {
if (file.isDirectory() && !file.getName().contains("@")) {
boolean skip = false;
for (String skipDir : skipDirs) {
if (file.getName().equals(skipDir)) {
skip = true;
break;
}
}
if (!skip) {
result.add(
new ActiveApexInfo(file, Environment.getRootDirectory()));
}
if (file.isDirectory() && !file.getName().contains("@")
// In flattened configuration, init special-cases the art directory
// and bind-mounts com.android.art.debug to com.android.art.
&& !file.getName().equals("com.android.art.debug")) {
result.add(new ActiveApexInfo(file, Environment.getRootDirectory()));
}
}
}