Devices without devnode are filtered out.

device/hid/input_service_linux.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <libudev.h>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "device/hid/input_service_linux.h"
 
 namespace device {
 
 namespace {
 
 const char kSubsystemHid[] = "hid";
 const char kSubsystemInput[] = "input";
 const char kTypeBluetooth[] = "bluetooth";
@@ skipping 31 matching lines @@
           device, kTypeBluetooth, NULL)) {
     return InputServiceLinux::InputDeviceInfo::TYPE_BLUETOOTH;
   }
   if (udev_device_get_parent_with_subsystem_devtype(device, kTypeUsb, NULL))
     return InputServiceLinux::InputDeviceInfo::TYPE_USB;
   if (udev_device_get_parent_with_subsystem_devtype(device, kTypeSerio, NULL))
     return InputServiceLinux::InputDeviceInfo::TYPE_SERIO;
   return InputServiceLinux::InputDeviceInfo::TYPE_UNKNOWN;
 }
 
+std::string GetParentDeviceName(udev_device* device, const char* subsystem) {
+  udev_device* parent =
+      udev_device_get_parent_with_subsystem_devtype(device, subsystem, NULL);
+  if (!parent)
+    return std::string();
+  const char* name = udev_device_get_property_value(parent, "NAME");
+  if (!name)
+    return std::string();
+  std::string result;
+  base::TrimString(name, "\"", &result);
+  return result;
+}
+
 class InputServiceLinuxImpl : public InputServiceLinux,
                               public DeviceMonitorLinux::Observer {
  public:
   // Implements DeviceMonitorLinux::Observer:
   virtual void OnDeviceAdded(udev_device* device) OVERRIDE;
   virtual void OnDeviceRemoved(udev_device* device) OVERRIDE;
 
  private:
   friend class InputServiceLinux;
 
@@ skipping 11 matching lines @@
 
 InputServiceLinuxImpl::~InputServiceLinuxImpl() {
   if (DeviceMonitorLinux::HasInstance())
     DeviceMonitorLinux::GetInstance()->RemoveObserver(this);
 }
 
 void InputServiceLinuxImpl::OnDeviceAdded(udev_device* device) {
   DCHECK(CalledOnValidThread());
   if (!device)
     return;
-  const char* path = udev_device_get_syspath(device);
-  if (!path)
+  const char* devnode = udev_device_get_devnode(device);
+  if (!devnode)
     return;
 
   InputDeviceInfo info;
-  info.id = path;
-
-  const char* name = udev_device_get_property_value(device, "NAME");
-  if (name)
-    info.name = name;
+  info.id = devnode;
 
   const char* subsystem = udev_device_get_subsystem(device);
   if (!subsystem)
     return;
-  else if (strcmp(subsystem, kSubsystemHid) == 0)
+  if (strcmp(subsystem, kSubsystemHid) == 0) {
     info.subsystem = InputServiceLinux::InputDeviceInfo::SUBSYSTEM_HID;
-  else if (strcmp(subsystem, kSubsystemInput) == 0)
+    info.name = GetParentDeviceName(device, kSubsystemHid);
+  } else if (strcmp(subsystem, kSubsystemInput) == 0) {
     info.subsystem = InputServiceLinux::InputDeviceInfo::SUBSYSTEM_INPUT;
-  else
+    info.name = GetParentDeviceName(device, kSubsystemInput);
+  } else {
     return;
+  }
 
   info.type = GetDeviceType(device);
 
   info.is_accelerometer = GetBoolProperty(device, kIdInputAccelerometer);
   info.is_joystick = GetBoolProperty(device, kIdInputJoystick);
   info.is_key = GetBoolProperty(device, kIdInputKey);
   info.is_keyboard = GetBoolProperty(device, kIdInputKeyboard);
   info.is_mouse = GetBoolProperty(device, kIdInputMouse);
   info.is_tablet = GetBoolProperty(device, kIdInputTablet);
   info.is_touchpad = GetBoolProperty(device, kIdInputTouchpad);
   info.is_touchscreen = GetBoolProperty(device, kIdInputTouchscreen);
 
   AddDevice(info);
 }
 
 void InputServiceLinuxImpl::OnDeviceRemoved(udev_device* device) {
   DCHECK(CalledOnValidThread());
   if (!device)
     return;
-  const char* path = udev_device_get_syspath(device);
-  if (!path)
-    return;
-  RemoveDevice(path);
+  const char* devnode = udev_device_get_devnode(device);
+  if (devnode)
+    RemoveDevice(devnode);
 }
 
 }  // namespace
 
 InputServiceLinux::InputDeviceInfo::InputDeviceInfo()
     : subsystem(SUBSYSTEM_UNKNOWN),
       type(TYPE_UNKNOWN),
       is_accelerometer(false),
       is_joystick(false),
       is_key(false),
@@ skipping 73 matching lines @@
 void InputServiceLinux::RemoveDevice(const std::string& id) {
   devices_.erase(id);
   FOR_EACH_OBSERVER(Observer, observers_, OnInputDeviceRemoved(id));
 }
 
 bool InputServiceLinux::CalledOnValidThread() const {
   return thread_checker_.CalledOnValidThread();
 }
 
 }  // namespace device