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

am: 65016074c2

Change-Id: I72dda41a53e95420653027176b04c7d359fa8e71
This commit is contained in:
Elliott Hughes 2016-11-30 18:00:11 +00:00 committed by android-build-merger
commit b94063edbf

View file

@ -351,11 +351,17 @@ static void process_kernel_cmdline() {
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;
}