From: Tim Kilbourn <tkilbourn@google.com>
Date: Thu, 26 Mar 2015 21:12:42 +0000 (-0700)
Subject: Use EPOLLWAKEUP properly.
X-Git-Tag: android-x86-6.0-r1~245^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3447df165f53d76791221531b769801741cfe04a;p=android-x86%2Fframeworks-native.git

Use EPOLLWAKEUP properly.

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

Bug: 19937342
Change-Id: Id35aef9ad84f101f7ada2eb87fb91e5c5e2b3357
---

diff --git a/services/inputflinger/EventHub.cpp b/services/inputflinger/EventHub.cpp
index 93ce0103d2..313569237a 100644
--- a/services/inputflinger/EventHub.cpp
+++ b/services/inputflinger/EventHub.cpp
@@ -1293,7 +1293,10 @@ status_t EventHub::openDeviceLocked(const char *devicePath) {
     // 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);