diff options
| author | Tom Cherry <tomcherry@google.com> | 2020-03-10 11:47:24 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2020-03-10 11:53:11 -0700 |
| commit | 832f9f1dbd2fd6f33f27622d7fd51e4a92534b31 (patch) | |
| tree | 36c73f90e61028db5529d886c139109e38065d25 /init/service_parser.cpp | |
| parent | 459ca0be74ca58a3b221750dfcac7e856f906667 (diff) | |
Revert "init: handle property service callbacks asynchronously"
This is apparently causing problems with reboot.
This reverts commit 7205c6293341c82701e849fa29cfab66916d1052.
Bug: 150863651
Test: build
Change-Id: Ib8a4835cdc8358a54c7acdebc5c95038963a0419
Diffstat (limited to 'init/service_parser.cpp')
| -rw-r--r-- | init/service_parser.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/init/service_parser.cpp b/init/service_parser.cpp index 51f4c9786..560f693f9 100644 --- a/init/service_parser.cpp +++ b/init/service_parser.cpp @@ -168,7 +168,6 @@ Result<void> ServiceParser::ParseInterface(std::vector<std::string>&& args) { const std::string fullname = interface_name + "/" + instance_name; - auto lock = std::lock_guard{service_lock}; for (const auto& svc : *service_list_) { if (svc->interfaces().count(fullname) > 0) { return Error() << "Interface '" << fullname << "' redefined in " << service_->name() @@ -599,7 +598,6 @@ Result<void> ServiceParser::EndSection() { } } - auto lock = std::lock_guard{service_lock}; Service* old_service = service_list_->FindService(service_->name()); if (old_service) { if (!service_->is_override()) { |