diff options
author | Jeff Brown <jeffbrown@google.com> | 2010-10-14 02:23:43 -0700 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2010-10-14 02:23:43 -0700 |
commit | a9b84229a3e9e0ae15e3e964985fac2314247be2 (patch) | |
tree | e3d7d7e6a54abc6e6f44ccc9a3d79e02812c2816 | |
parent | 844a6b3ccaff1ad1443ad985e4527b733ce97c0e (diff) | |
download | frameworks_base-a9b84229a3e9e0ae15e3e964985fac2314247be2.zip frameworks_base-a9b84229a3e9e0ae15e3e964985fac2314247be2.tar.gz frameworks_base-a9b84229a3e9e0ae15e3e964985fac2314247be2.tar.bz2 |
Make sure EventHub reports added/removed devices immediately.
Fixed a bug where EventHub would not report changes in devices
until the next event.
Bug: 3096147
Change-Id: Ie4c3e1d14d0ad806cfaa212611ce06034d1b94d4
-rw-r--r-- | libs/ui/EventHub.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libs/ui/EventHub.cpp b/libs/ui/EventHub.cpp index c0be3a0..944731d 100644 --- a/libs/ui/EventHub.cpp +++ b/libs/ui/EventHub.cpp @@ -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); } } |