Merge "[conflict] Merge "Fix logspam due to missing /vendor/etc/public.libraries.txt" into main am: 997af74d7f am: b8cdb954e7 am: ea8bfaa36e" into udc-dev-plus-aosp

2023-07-12 17:00:36 +00:00
parent 4b3e03d385 9aba0df1e0
commit 98050f1b0b
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/SystemConfig.java
+++ b/services/core/java/com/android/server/SystemConfig.java
@@ -1827,6 +1827,9 @@ public class SystemConfig {
                        soname, soname, new String[0], true);
                mSharedLibraries.put(entry.name, entry);
            }
+        } catch (FileNotFoundException e) {
+            // Expected for /vendor/etc/public.libraries.txt on some devices
+            Slog.d(TAG, listFile + " does not exist");
        } catch (IOException e) {
            Slog.w(TAG, "Failed to read public libraries file " + listFile, e);
        }