commit 5a4acf2637197f4c52cb919a8a186f7dcc599a51
author Elliott Hughes <enh@google.com> Wed Nov 30 17:54:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 30 17:54:31 2016 +0000
tree c1c4da6bab6c209a4bc1cb386b2a2d2548e6d2a5
parent da68bb22b9303b8d74b2062e17bde3d84e2ddc24
parent 64a34b93564b71e378712af0cea4017e8985ff5e

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

Change-Id: Iae57b79abeb7a372c0e483316d328d5307c66b73

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;
 }