summaryrefslogtreecommitdiff
path: root/libs/input/Keyboard.cpp
diff options
context:
space:
mode:
author Chris Ye <lzye@google.com> 2020-07-04 18:22:41 -0700
committer Chris Ye <lzye@google.com> 2020-07-04 18:24:49 -0700
commit1d927aa2377c9e1fa57f9e2e409dc9a33d1bcc7a (patch)
tree5b031bdd96c6dcc79d9f9468c46348cc7491d9f9 /libs/input/Keyboard.cpp
parent12d24c504621cc5ff117b41726d734475eb8836c (diff)
Convert InputDeviceConfigurationFileType to enum class.
Convert InputDeviceConfigurationFileType to enum class and the reference to it accordingly. Test: atest inputflinger_tests Change-Id: I9a7c0371aa3c519ca69cc4e019079f9645d4ff09
Diffstat (limited to 'libs/input/Keyboard.cpp')
-rw-r--r--libs/input/Keyboard.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/input/Keyboard.cpp b/libs/input/Keyboard.cpp
index 56900c129e..25025f2963 100644
--- a/libs/input/Keyboard.cpp
+++ b/libs/input/Keyboard.cpp
@@ -105,8 +105,7 @@ bool KeyMap::probeKeyMap(const InputDeviceIdentifier& deviceIdentifier,
status_t KeyMap::loadKeyLayout(const InputDeviceIdentifier& deviceIdentifier,
const std::string& name) {
- std::string path(getPath(deviceIdentifier, name,
- INPUT_DEVICE_CONFIGURATION_FILE_TYPE_KEY_LAYOUT));
+ std::string path(getPath(deviceIdentifier, name, InputDeviceConfigurationFileType::KEY_LAYOUT));
if (path.empty()) {
return NAME_NOT_FOUND;
}
@@ -122,8 +121,8 @@ status_t KeyMap::loadKeyLayout(const InputDeviceIdentifier& deviceIdentifier,
status_t KeyMap::loadKeyCharacterMap(const InputDeviceIdentifier& deviceIdentifier,
const std::string& name) {
- std::string path = getPath(deviceIdentifier, name,
- INPUT_DEVICE_CONFIGURATION_FILE_TYPE_KEY_CHARACTER_MAP);
+ std::string path =
+ getPath(deviceIdentifier, name, InputDeviceConfigurationFileType::KEY_CHARACTER_MAP);
if (path.empty()) {
return NAME_NOT_FOUND;
}