commit 0188274148f1462bfdc1c95457a44e2458fffa5a
author Tom Cherry <tomcherry@google.com> Tue Mar 10 09:08:02 2020 -0700
committer Tom Cherry <tomcherry@google.com> Mon Mar 16 09:20:22 2020 -0700
tree 6c415f45dd8584eff1817d2697000708fcd438a5
parent e4e0566e0268d13f6a23a87c946d235bd1fba57f

Revert "init: handle property service callbacks asynchronously"

This is apparently causing problems with reboot.

This reverts commit d2dab830d3ec260ccd982d147d4eb0ef74071261.

Bug: 150863651
Test: build
Merged-In: Ib8a4835cdc8358a54c7acdebc5c95038963a0419
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)