Merge "Use InputDeviceIdentifier.getCanonicalName"

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(

    }

    // Try device name.

    return getInputDeviceConfigurationFilePathByName(deviceIdentifier.name, type);

    return getInputDeviceConfigurationFilePathByName(deviceIdentifier.getCanonicalName(), type);

}

std::string getInputDeviceConfigurationFilePathByName(