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

Commit 26cad1bc authored by Elliott Hughes's avatar Elliott Hughes
Browse files

resolved conflicts for merge of d6288751 to master 

Change-Id: Ibfe5be04e093253c36c47149870273ae3ab860c0
parents 364c8aca d6288751

services/input/EventHub.cpp

+6 −0
Original line number Diff line number Diff line
@@ -1275,6 +1275,12 @@ status_t EventHub::openDeviceLocked(const char *devicePath) { 


    String8 wakeMechanism("EPOLLWAKEUP");

    if (!mUsingEpollWakeup) {

#ifndef EVIOCSSUSPENDBLOCK

        // uapi headers don't include EVIOCSSUSPENDBLOCK, and future kernels

        // will use an epoll flag instead, so as long as we want to support

        // this feature, we need to be prepared to define the ioctl ourselves.

#define EVIOCSSUSPENDBLOCK _IOW('E', 0x91, int)

#endif

        if (ioctl(fd, EVIOCSSUSPENDBLOCK, 1)) {

            wakeMechanism = "<none>";

        } else {