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

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 am: 98050f1b0b am: 62b5da53bf

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24029949

Change-Id: Idb9a93053990dce0e9bcf56cdd258b99739bff19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2023-07-12 18:27:04 +00:00
committed by Automerger Merge Worker
parent 768ea680ff 62b5da53bf
commit 11cb68c6df
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/SystemConfig.java
View File

@@ -1827,6 +1827,9 @@ public class SystemConfig {
soname, soname, new String[0], true); soname, soname, new String[0], true);
mSharedLibraries.put(entry.name, entry); 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) { } catch (IOException e) {
Slog.w(TAG, "Failed to read public libraries file " + listFile, e); Slog.w(TAG, "Failed to read public libraries file " + listFile, e);
} }