ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

am 2d441e14: Merge "Make sure EventHub reports added/removed devices immediately." into gingerbread

Browse Source 
Merge commit '2d441e148502bb492816ef84837510397f77a039' into gingerbread-plus-aosp

* commit '2d441e148502bb492816ef84837510397f77a039':
  Make sure EventHub reports added/removed devices immediately.
This commit is contained in:
Jeff Brown 2010-10-14 12:03:36 -07:00 committed by Android Git Automerger
commit b2c3e78597
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/ui/EventHub.cpp
View File

@ -439,11 +439,10 @@ bool EventHub::getEvent(RawEvent* outEvent)
// Since mFDs[0] is used for inotify, we process regular events starting at index 1.
mInputDeviceIndex += 1;
if (mInputDeviceIndex >= mFDCount) {
mInputDeviceIndex = 0;
break;
}
const struct pollfd &pfd = mFDs[mInputDeviceIndex];
const struct pollfd& pfd = mFDs[mInputDeviceIndex];
if (pfd.revents & POLLIN) {
int32_t readSize = read(pfd.fd, mInputBufferData,
sizeof(struct input_event) * INPUT_BUFFER_SIZE);
@ -460,11 +459,17 @@ bool EventHub::getEvent(RawEvent* outEvent)
}
}
#if HAVE_INOTIFY
// readNotify() will modify mFDs and mFDCount, so this must be done after
// processing all other events.
if(mFDs[0].revents & POLLIN) {
readNotify(mFDs[0].fd);
mFDs[0].revents = 0;
continue; // report added or removed devices immediately
}
#endif
mInputDeviceIndex = 0;
// Poll for events. Mind the wake lock dance!
// We hold a wake lock at all times except during poll(). This works due to some
@ -482,7 +487,7 @@ bool EventHub::getEvent(RawEvent* outEvent)
if (pollResult <= 0) {
if (errno != EINTR) {
LOGW("select failed (errno=%d)\n", errno);
LOGW("poll failed (errno=%d)\n", errno);
usleep(100000);
}
}