resolved conflicts for merge of d6288751 to master
Change-Id: Ibfe5be04e093253c36c47149870273ae3ab860c0
diff --git a/services/input/EventHub.cpp b/services/input/EventHub.cpp
index e67c64c..09fca040 100644
--- a/services/input/EventHub.cpp
+++ b/services/input/EventHub.cpp
@@ -1275,6 +1275,12 @@
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 {