diff options
author | 2013-11-12 15:02:18 -0800 | |
---|---|---|
committer | 2013-11-12 15:02:18 -0800 | |
commit | d62887519266951e63ae4f3d5c4b33d235c64ce3 (patch) | |
tree | f8d2fe3265126750265f39ad0efccfed619cb934 | |
parent | 8a71cdaeb159af1bf851264c8ad5d037a705bcfa (diff) | |
parent | 221080078a36f4b30fe6edc8c91f339a5b84ed83 (diff) |
am 22108007: am 01e42c0b: Merge "Fix libinput to build with uapi headers."
* commit '221080078a36f4b30fe6edc8c91f339a5b84ed83':
Fix libinput to build with uapi headers.
-rw-r--r-- | services/input/EventHub.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/input/EventHub.cpp b/services/input/EventHub.cpp index 4d70d5f1ee08..fc64656b1745 100644 --- a/services/input/EventHub.cpp +++ b/services/input/EventHub.cpp @@ -1254,6 +1254,12 @@ status_t EventHub::openDeviceLocked(const char *devicePath) { // Enable wake-lock behavior on kernels that support it. // TODO: Only need this for devices that can really wake the system. +#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 bool usingSuspendBlockIoctl = !ioctl(fd, EVIOCSSUSPENDBLOCK, 1); // Tell the kernel that we want to use the monotonic clock for reporting timestamps |