diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2018-05-18 15:25:15 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2018-05-29 13:46:12 -0700 |
| commit | 06aeb41c16cb26e0f53cb964e657fe528437bb4d (patch) | |
| tree | 8f3b41c142e3f89ee504b1394dcbe7b092ac50cd /init/init.cpp | |
| parent | eca25076343945f901c7f631aad5e915c14c1a56 (diff) | |
| download | system_core-06aeb41c16cb26e0f53cb964e657fe528437bb4d.tar.gz system_core-06aeb41c16cb26e0f53cb964e657fe528437bb4d.tar.bz2 system_core-06aeb41c16cb26e0f53cb964e657fe528437bb4d.zip | |
init: turn keychords into a standalone class
Test: init_tests
Bug: 64114943
Change-Id: Ie760e4a3a661260ed2aabb8a92fe65fc93521cb5
Diffstat (limited to 'init/init.cpp')
| -rw-r--r-- | init/init.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/init/init.cpp b/init/init.cpp index 43242b2dc..5652c5e51 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -749,12 +749,13 @@ int main(int argc, char** argv) { am.QueueBuiltinAction(MixHwrngIntoLinuxRngAction, "MixHwrngIntoLinuxRng"); am.QueueBuiltinAction(SetMmapRndBitsAction, "SetMmapRndBits"); am.QueueBuiltinAction(SetKptrRestrictAction, "SetKptrRestrict"); + Keychords keychords; am.QueueBuiltinAction( - [&epoll](const BuiltinArguments& args) -> Result<Success> { + [&epoll, &keychords](const BuiltinArguments& args) -> Result<Success> { for (const auto& svc : ServiceList::GetInstance()) { - svc->set_keychord_id(GetKeychordId(svc->keycodes())); + svc->set_keychord_id(keychords.GetId(svc->keycodes())); } - KeychordInit(&epoll, HandleKeychord); + keychords.Start(&epoll, HandleKeychord); return Success(); }, "KeychordInit"); |