commit b45635c8a3f4b38298ebe60922a6f61c4b99e491
author Siarhei Vishniakou <svv@google.com> Wed Feb 20 19:22:09 2019 -0600
committer Siarhei Vishniakou <svv@google.com> Thu Feb 21 14:03:06 2019 -0600
tree c643e6f1cddc7527a7742538e4bca258ac32a875
parent 3e78decd5e6fe3590da3e91680aae51d43c62d5f

Replace non-alphanumerics with _ in VirtualKeyMap

We currently rewrite device name for finding the matching .idc, .kl,
.kcm files, but we aren't allowing this for virtual key maps.

Rewrite the name for virtual devices to provide some flexibility in
matching for the right files in sys/board_properties.

Bug: 113575658
Test: atest libinput_tests inputflinger_tests
Change-Id: I54d159e9ecf02327cae388ae14c0bcf21c415e6e

services/inputflinger/EventHub.cpp

diff --git a/services/inputflinger/EventHub.cpp b/services/inputflinger/EventHub.cpp
index 4735643..4da1473 100644
--- a/services/inputflinger/EventHub.cpp
+++ b/services/inputflinger/EventHub.cpp
@@ -1617,7 +1617,7 @@
     // The virtual key map is supplied by the kernel as a system board property file.
     std::string path;
     path += "/sys/board_properties/virtualkeys.";
-    path += device->identifier.name;
+    path += device->identifier.getCanonicalName();
     if (access(path.c_str(), R_OK)) {
         return false;
     }