commit 1d927aa2377c9e1fa57f9e2e409dc9a33d1bcc7a
author Chris Ye <lzye@google.com> Sat Jul 04 18:22:41 2020 -0700
committer Chris Ye <lzye@google.com> Sat Jul 04 18:24:49 2020 -0700
tree 5b031bdd96c6dcc79d9f9468c46348cc7491d9f9
parent 12d24c504621cc5ff117b41726d734475eb8836c

Convert InputDeviceConfigurationFileType to enum class.

Convert InputDeviceConfigurationFileType to enum class and the reference
to it accordingly.

Test: atest inputflinger_tests
Change-Id: I9a7c0371aa3c519ca69cc4e019079f9645d4ff09

libs/input/Keyboard.cpp

diff --git a/libs/input/Keyboard.cpp b/libs/input/Keyboard.cpp
index 56900c1..25025f2 100644
--- a/libs/input/Keyboard.cpp
+++ b/libs/input/Keyboard.cpp
@@ -105,8 +105,7 @@
 
 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::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;
     }