commit f3310955ef12ea7a76c9e37c4b488a82acea81da
author caozhiyuan <cao.zhiyuan@zte.com.cn> Wed Nov 30 19:12:14 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 30 19:12:14 2016 +0000
tree 87ec85b2bc606e7ce059da02eee8c947bb38ece3
parent 895930d2e6d8e49836209680d3af88d1b4b948d8
parent bcd0f0522b9e3a12f30abbbbde09dd2da9393431

init: Fix sync issue on property trigger.
am: 876ad4571e

Change-Id: Ie5958255e4a785c951cc04e47d139fe1ae719139

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 84da2b9..cd2d2e6 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -478,11 +478,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;
 }