commit b3df5fa8edc708b16780e81dde0e109a854e9d36
author Elliott Hughes <enh@google.com> Wed Nov 30 18:00:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 30 18:00:11 2016 +0000
tree 7ea86f5a2de89e768cf4eabf311898ff73bca87d
parent 707924e86e7e109a0689e920418605c982fbc5a2
parent 5a4acf2637197f4c52cb919a8a186f7dcc599a51

Merge "init: Fix sync issue on property trigger." am: 80d2f01fbf
am: 65016074c2

Change-Id: I72dda41a53e95420653027176b04c7d359fa8e71

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 734f129..371186b 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -351,11 +351,17 @@
     if (qemu[0]) import_kernel_cmdline(true, import_kernel_nv);
 }
 
+static int property_enable_triggers_action(const std::vector<std::string>& args)
+{
+    /* Enable property triggers. */
+    property_triggers_enabled = 1;
+    return 0;
+}
+
 static int queue_property_triggers_action(const std::vector<std::string>& args)
 {
+    ActionManager::GetInstance().QueueBuiltinAction(property_enable_triggers_action, "enable_property_trigger");
     ActionManager::GetInstance().QueueAllPropertyTriggers();
-    /* enable property triggers */
-    property_triggers_enabled = 1;
     return 0;
 }