commit 3447df165f53d76791221531b769801741cfe04a
author Tim Kilbourn <tkilbourn@google.com> Thu Mar 26 14:12:42 2015 -0700
committer Tim Kilbourn <tkilbourn@google.com> Thu Mar 26 14:12:42 2015 -0700
tree eb5924d1cc793f8cbe75191d1ae7949e294be5c0
parent 5b20fd0882e6a1754cad7342f7ceda3753e8f567

Use EPOLLWAKEUP properly.

We were trying to use it only when it wasn't supported.

Bug: 19937342
Change-Id: Id35aef9ad84f101f7ada2eb87fb91e5c5e2b3357

services/inputflinger/EventHub.cpp

diff --git a/services/inputflinger/EventHub.cpp b/services/inputflinger/EventHub.cpp
index 93ce010..3135692 100644
--- a/services/inputflinger/EventHub.cpp
+++ b/services/inputflinger/EventHub.cpp
@@ -1293,7 +1293,10 @@
     // Register with epoll.
     struct epoll_event eventItem;
     memset(&eventItem, 0, sizeof(eventItem));
-    eventItem.events = mUsingEpollWakeup ? EPOLLIN : EPOLLIN | EPOLLWAKEUP;
+    eventItem.events = EPOLLIN;
+    if (mUsingEpollWakeup) {
+        eventItem.events |= EPOLLWAKEUP;
+    }
     eventItem.data.u32 = deviceId;
     if (epoll_ctl(mEpollFd, EPOLL_CTL_ADD, fd, &eventItem)) {
         ALOGE("Could not add device fd to epoll instance.  errno=%d", errno);