summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorspang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-09 21:52:37 +0000
committerspang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-09 21:52:37 +0000
commita4139bb350549d2fefed191f2fb3c98fdfa42d41 (patch)
tree534cfe103cbcbc946e1486ddecc9e317953101b8 /ui
parent9f2974d0cc960e84822aa92e796c838f8d0b622b (diff)
downloadchromium_src-a4139bb350549d2fefed191f2fb3c98fdfa42d41.zip
chromium_src-a4139bb350549d2fefed191f2fb3c98fdfa42d41.tar.gz
chromium_src-a4139bb350549d2fefed191f2fb3c98fdfa42d41.tar.bz2
ozone: evdev: Filter devices by path
We already do this in the non-udev case, and X11 does this as well. We only want the evdev devices, which are named /dev/input/eventN. BUG=none TEST=content_shell --ozone-platform=test Review URL: https://codereview.chromium.org/230883005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/events/ozone/evdev/device_manager_udev.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/events/ozone/evdev/device_manager_udev.cc b/ui/events/ozone/evdev/device_manager_udev.cc
index de7b29d..f08a0b0 100644
--- a/ui/events/ozone/evdev/device_manager_udev.cc
+++ b/ui/events/ozone/evdev/device_manager_udev.cc
@@ -10,6 +10,7 @@
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_pump_ozone.h"
+#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "ui/events/ozone/evdev/device_manager_evdev.h"
#include "ui/events/ozone/evdev/event_factory_evdev.h"
@@ -101,6 +102,10 @@ bool UdevEnumerateInputDevices(struct udev* udev,
if (!path)
continue;
+ // Filter non-evdev device notes.
+ if (!StartsWithASCII(path, "/dev/input/event", true))
+ continue;
+
// Found input device node; attach.
device_callback.Run(base::FilePath(path));
}