Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2516)

Unified Diff: device/hid/input_service_linux.cc

Issue 250803005: Devices without devnode are filtered out. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | device/hid/input_service_linux_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/hid/input_service_linux.cc
diff --git a/device/hid/input_service_linux.cc b/device/hid/input_service_linux.cc
index 299d7a41422da3a07ab8f14ffa44dce809f3faf3..90132e91af24b78e7afa9ff0da84ec1af8fd93b2 100644
--- a/device/hid/input_service_linux.cc
+++ b/device/hid/input_service_linux.cc
@@ -8,6 +8,7 @@
#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"
@@ -59,6 +60,19 @@ InputServiceLinux::InputDeviceInfo::Type GetDeviceType(udev_device* device) {
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:
@@ -90,26 +104,25 @@ 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);
@@ -129,10 +142,9 @@ 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
« no previous file with comments | « no previous file | device/hid/input_service_linux_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698