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

Commit b3635a44 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

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

Merge commit '6d5bb88454db2fc798a07ec1085ef55572dbe670'

* commit '6d5bb88454db2fc798a07ec1085ef55572dbe670':
  Only monitor recognized uevent devices.
parents 18e4c555 9d941d86

libs/ui/EventHub.cpp

+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);