am aac6a748: Merge "Only monitor recognized uevent devices." into gingerbread

Merge commit 'aac6a7481757e3477e489f311e53385988a5d9a0' into gingerbread-plus-aosp

* commit 'aac6a7481757e3477e489f311e53385988a5d9a0':
  Only monitor recognized uevent devices.

1 files changed, 8 insertions, 1 deletions

diff --git a/libs/ui/EventHub.cpp b/libs/ui/EventHub.cpp
index a3c34d0..891661d 100644
--- a/libs/ui/EventHub.cpp
+++ b/libs/ui/EventHub.cpp
@@ -581,7 +581,6 @@ int EventHub::open_device(const char *deviceName)
         if (strcmp(name, test) == 0) {
             LOGI("ignoring event id %s driver %s\n", deviceName, test);
             close(fd);
-            fd = -1;
             return -1;
         }
     }
@@ -813,6 +812,14 @@ int EventHub::open_device(const char *deviceName)
                 device->id, name, propName, keylayoutFilename);
     }
 
+    // If the device isn't recognized as something we handle, don't monitor it.
+    if (device->classes == 0) {
+        LOGV("Dropping device %s %p, id = %d\n", deviceName, device, devid);
+        close(fd);
+        delete device;
+        return -1;
+    }
+
     LOGI("New device: path=%s name=%s id=0x%x (of 0x%x) index=%d fd=%d classes=0x%x\n",
          deviceName, name, device->id, mNumDevicesById, mFDCount, fd, device->classes);