summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcaozhiyuan <cao.zhiyuan@zte.com.cn>2016-11-30 19:12:14 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-30 19:12:14 +0000
commitc86dbc9a07c7f7f31ea39d7397680eb48ea2e559 (patch)
tree87ec85b2bc606e7ce059da02eee8c947bb38ece3
parentfc1a1dfd3c91932081e4a1bc131fbdd49d245dd6 (diff)
parent876ad4571e2eab037a2537f7334220e249a78343 (diff)
init: Fix sync issue on property trigger.
am: 876ad4571e Change-Id: Ie5958255e4a785c951cc04e47d139fe1ae719139
-rw-r--r--init/init.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/init/init.cpp b/init/init.cpp
index 84da2b956..cd2d2e6ab 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -478,11 +478,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;
}