diff options
author | Nate Myren <ntmyren@google.com> | 2024-04-19 19:07:34 +0000 |
---|---|---|
committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2024-04-19 19:07:34 +0000 |
commit | 9437444cf55cc2bb962aff7a031dda01533d72ee (patch) | |
tree | 088df910c641b9bf6eece30d1bb62c4ac91d3c8b | |
parent | 785e161dd8e0e44fa79c02fad34fb3992a7c81e4 (diff) | |
download | bionic-9437444cf55cc2bb962aff7a031dda01533d72ee.tar.gz |
Only try to initialize appcompat properties if the folder is present
If the Init process doesn't write the appcompat system properties
folder, do not attempt to initialize it
Bug: 331307495
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d071e949a6153e76eb7c67e5947d4d387a8afe2d)
Merged-In: I21716ea87e55a63a1b79127887c451d0fcf006f3
Change-Id: I21716ea87e55a63a1b79127887c451d0fcf006f3
-rw-r--r-- | libc/system_properties/system_properties.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libc/system_properties/system_properties.cpp b/libc/system_properties/system_properties.cpp index 9dd5e35ce..1dedb61e7 100644 --- a/libc/system_properties/system_properties.cpp +++ b/libc/system_properties/system_properties.cpp @@ -120,14 +120,18 @@ bool SystemProperties::AreaInit(const char* filename, bool* fsetxattr_failed, return false; } - auto* appcompat_contexts = new (appcompat_override_contexts_data_) ContextsSerialized(); appcompat_filename_ = PropertiesFilename(properties_filename_.c_str(), "appcompat_override"); - if (!appcompat_contexts->Initialize(true, appcompat_filename_.c_str(), fsetxattr_failed, - load_default_path)) { - appcompat_override_contexts_ = nullptr; - return false; + appcompat_override_contexts_ = nullptr; + if (access(appcompat_filename_.c_str(), F_OK) != -1) { + auto* appcompat_contexts = new (appcompat_override_contexts_data_) ContextsSerialized(); + if (!appcompat_contexts->Initialize(true, appcompat_filename_.c_str(), fsetxattr_failed, + load_default_path)) { + // The appcompat folder exists, but initializing it failed + return false; + } else { + appcompat_override_contexts_ = appcompat_contexts; + } } - appcompat_override_contexts_ = appcompat_contexts; initialized_ = true; return true; |