diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2018-04-30 07:33:31 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2018-05-08 13:19:12 -0700 |
| commit | 353bf1f945aa6f95d2a7856ddee344936bf95673 (patch) | |
| tree | 6da39d9a1f223c1a9283d0ba9310be0163f10ea6 /init/init.cpp | |
| parent | 8ae7375f020367bab2e99a0737d7f7bde69cddf9 (diff) | |
| download | system_core-353bf1f945aa6f95d2a7856ddee344936bf95673.tar.gz system_core-353bf1f945aa6f95d2a7856ddee344936bf95673.tar.bz2 system_core-353bf1f945aa6f95d2a7856ddee344936bf95673.zip | |
init: switch from /dev/keychord to /dev/input/
Replace deprecated /dev/keychord driver with /dev/input/ interface.
Will restrict which nodes are active and relevant, and try to mask
out any unreferenced inputs with EVIOCSMASK if available.
Test: manual, boot, check registered chord works
Bug: 64114943
Change-Id: I2bbf84a6e472d720f02282e10d56795b75ac62d1
Diffstat (limited to 'init/init.cpp')
| -rw-r--r-- | init/init.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/init.cpp b/init/init.cpp index 42032caeb..54bbb4b66 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -354,8 +354,8 @@ static Result<Success> wait_for_coldboot_done_action(const BuiltinArguments& arg return Success(); } -static Result<Success> keychord_init_action(const BuiltinArguments& args) { - keychord_init(); +static Result<Success> KeychordInitAction(const BuiltinArguments& args) { + KeychordInit(); return Success(); } @@ -772,7 +772,7 @@ int main(int argc, char** argv) { am.QueueBuiltinAction(MixHwrngIntoLinuxRngAction, "MixHwrngIntoLinuxRng"); am.QueueBuiltinAction(SetMmapRndBitsAction, "SetMmapRndBits"); am.QueueBuiltinAction(SetKptrRestrictAction, "SetKptrRestrict"); - am.QueueBuiltinAction(keychord_init_action, "keychord_init"); + am.QueueBuiltinAction(KeychordInitAction, "KeychordInit"); am.QueueBuiltinAction(console_init_action, "console_init"); // Trigger all the boot actions to get us started. |
