ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: b94063edbf

Change-Id: I65c9d1b2e17550d73a6a45d44e6094d79956524b
This commit is contained in:
Elliott Hughes 2016-11-30 18:04:41 +00:00 • committed by android-build-merger
commit 15c25fbed4
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
init/init.cpp
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;
}