commit 832f9f1dbd2fd6f33f27622d7fd51e4a92534b31
author Tom Cherry <tomcherry@google.com> Tue Mar 10 11:47:24 2020 -0700
committer Tom Cherry <tomcherry@google.com> Tue Mar 10 11:53:11 2020 -0700
tree 36c73f90e61028db5529d886c139109e38065d25
parent 459ca0be74ca58a3b221750dfcac7e856f906667

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

init/lmkd_service.cpp

diff --git a/init/lmkd_service.cpp b/init/lmkd_service.cpp
index a531d0a..dd1ab4d 100644
--- a/init/lmkd_service.cpp
+++ b/init/lmkd_service.cpp
@@ -79,8 +79,7 @@
 }
 
 static void RegisterServices(pid_t exclude_pid) {
-    auto lock = std::lock_guard{service_lock};
-    for (const auto& service : ServiceList::GetInstance()) {
+    for (const auto& service : ServiceList::GetInstance().services()) {
         auto svc = service.get();
         if (svc->oom_score_adjust() != DEFAULT_OOM_SCORE_ADJUST) {
             // skip if process is excluded or not yet forked (pid==0)