commit 77be1fecfcb020edf9691b6056142c82ac733f3e
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 22 02:27:34 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 22 02:27:34 2019 +0000
tree c4f2c41d0862fdeff00ea32b9fc67e1925bb80b7
parent e7d922888450c283047960b1fa3579759880edeb
parent 409ec1a880f770844120e8b0fdd02837bf0c3bf7

Merge "Use InputDeviceIdentifier.getCanonicalName"

libs/input/InputDevice.cpp

diff --git a/libs/input/InputDevice.cpp b/libs/input/InputDevice.cpp
index 7dcad5a..dab6eac 100644
--- a/libs/input/InputDevice.cpp
+++ b/libs/input/InputDevice.cpp
@@ -46,15 +46,9 @@
 
 static void appendInputDeviceConfigurationFileRelativePath(std::string& path,
         const std::string& name, InputDeviceConfigurationFileType type) {
-    path.append(CONFIGURATION_FILE_DIR[type]);
-    for (size_t i = 0; i < name.length(); i++) {
-        char ch = name[i];
-        if (!isValidNameChar(ch)) {
-            ch = '_';
-        }
-        path.append(&ch, 1);
-    }
-    path.append(CONFIGURATION_FILE_EXTENSION[type]);
+    path += CONFIGURATION_FILE_DIR[type];
+    path += name;
+    path += CONFIGURATION_FILE_EXTENSION[type];
 }
 
 std::string getInputDeviceConfigurationFilePathByDeviceIdentifier(
@@ -84,7 +78,7 @@
     }
 
     // Try device name.
-    return getInputDeviceConfigurationFilePathByName(deviceIdentifier.name, type);
+    return getInputDeviceConfigurationFilePathByName(deviceIdentifier.getCanonicalName(), type);
 }
 
 std::string getInputDeviceConfigurationFilePathByName(