commit a1a839c507d2acc7367aa7ddb47c1482cb86187a
author Elliott Hughes <enh@google.com> Wed Nov 30 18:10:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 30 18:10:12 2016 +0000
tree 297562bd3fd23c874f0242aeb002e19cbdd69b9e
parent 77ebd8a1d074b2c8deb5b7408c56c0492daf0c4e
parent 953044ea3147ddc996a307324939ffdd4d2dc719

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

Change-Id: I166716bfb6bcb4ea9441b059e270d83862f12d10

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 85065b3..04283f4 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -459,11 +459,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;
 }