summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-07-11 23:03:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-11 23:03:52 +0000
commitea8bfaa36ed287976e346117bdda2eaa654731db (patch)
tree86a34926377aab9fc674aace4162b826fa622989
parenta8c202a23ebca00f2ab793981335105b6607ff69 (diff)
parentb8cdb954e77984ea5758e930624e447249ee727e (diff)
Merge "Fix logspam due to missing /vendor/etc/public.libraries.txt" into main am: 997af74d7f am: b8cdb954e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2650395 Change-Id: I2f91c1a25325c69fc6ed9f091b7b254da8501ee8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/com/android/server/SystemConfig.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java
index 088c0016c0da..21da321e2b08 100644
--- a/core/java/com/android/server/SystemConfig.java
+++ b/core/java/com/android/server/SystemConfig.java
@@ -1848,6 +1848,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);
}