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

Merge "SystemConfig: Tolerate absent native lib paths."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-09-24 13:35:25 +00:00
committed by Android (Google) Code Review
parent a0d41416fc 8f036fd454
commit 87696c9b8e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1520,7 +1520,12 @@ public class SystemConfig {
readPublicLibrariesListFile(new File("/vendor/etc/public.libraries.txt"));
String[] dirs = {"/system/etc", "/system_ext/etc", "/product/etc"};
for (String dir : dirs) {
for (File f : (new File(dir)).listFiles()) {
File[] files = new File(dir).listFiles();
if (files == null) {
Slog.w(TAG, "Public libraries file folder missing: " + dir);
continue;
}
for (File f : files) {
String name = f.getName();
if (name.startsWith("public.libraries-") && name.endsWith(".txt")) {
readPublicLibrariesListFile(f);