diff options
Diffstat (limited to 'init/action_parser.cpp')
| -rw-r--r-- | init/action_parser.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/init/action_parser.cpp b/init/action_parser.cpp index 148116200..2d497b386 100644 --- a/init/action_parser.cpp +++ b/init/action_parser.cpp @@ -19,7 +19,11 @@ #include <android-base/properties.h> #include <android-base/strings.h> -#include "stable_properties.h" +#if defined(__ANDROID__) +#include "property_service.h" +#else +#include "host_init_stubs.h" +#endif using android::base::GetBoolProperty; using android::base::StartsWith; @@ -36,15 +40,7 @@ bool IsActionableProperty(Subcontext* subcontext, const std::string& prop_name) return true; } - if (kExportedActionableProperties.count(prop_name) == 1) { - return true; - } - for (const auto& prefix : kPartnerPrefixes) { - if (android::base::StartsWith(prop_name, prefix)) { - return true; - } - } - return false; + return CanReadProperty(subcontext->context(), prop_name); } Result<Success> ParsePropertyTrigger(const std::string& trigger, Subcontext* subcontext, |