Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a046243 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android (Google) Code Review
Browse files

Merge "Only monitor recognized uevent devices." into gingerbread

parents 068b82f2 2e7a5302
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -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);