Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2c3e785 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

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

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

* commit '2d441e148502bb492816ef84837510397f77a039':
  Make sure EventHub reports added/removed devices immediately.
parents 7f82f9bb c04563d3

libs/ui/EventHub.cpp

+8 −3
Original line number Diff line number Diff line
@@ -439,7 +439,6 @@ 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;

            }
@@ -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);

            }

        }