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

Commit 7c360aaf authored by Nick Pelly's avatar Nick Pelly Committed by Android Git Automerger
Browse files

am e834722f: Merge "Fix failure to open AVRCP input device due to EPERM." into eclair 

Merge commit 'e834722f547d13eaa453464502456892c6225e42' into eclair-plus-aosp

* commit 'e834722f547d13eaa453464502456892c6225e42':
  Fix failure to open AVRCP input device due to EPERM.
parents c9448735 1a01fad3

libs/ui/EventHub.cpp

+8 −2
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ int EventHub::open_device(const char *deviceName) 
{

    int version;

    int fd;

    int attempt;

    struct pollfd *new_mFDs;

    device_t **new_devices;

    char **new_device_names;
@@ -501,11 +502,16 @@ int EventHub::open_device(const char *deviceName) 


    AutoMutex _l(mLock);



    for (attempt = 0; attempt < 10; attempt++) {

        fd = open(deviceName, O_RDWR);

        if (fd >= 0) break;

        usleep(100);

    }

    if(fd < 0) {

        LOGE("could not open %s, %s\n", deviceName, strerror(errno));

        return -1;

    }

    LOGV("Opened device: %s (%d failures)", deviceName, attempt);



    if(ioctl(fd, EVIOCGVERSION, &version)) {

        LOGE("could not get driver version for %s, %s\n", deviceName, strerror(errno));