OSDN Git Service

am 3922484d: Merge "Optimize EventHub reads." into gingerbread
authorJeff Brown <jeffbrown@google.com>
Wed, 18 Aug 2010 20:37:44 +0000 (13:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Aug 2010 20:37:44 +0000 (13:37 -0700)
Merge commit '3922484d7458a4ab72fc1ca8952a0776dd1c7d20' into gingerbread-plus-aosp

* commit '3922484d7458a4ab72fc1ca8952a0776dd1c7d20':
  Optimize EventHub reads.

1  2 
include/ui/EventHub.h
libs/ui/EventHub.cpp

Simple merge
@@@ -636,9 -657,9 +655,10 @@@ int EventHub::open_device(const char *d
          return -1;
      }
  
 +    device->fd = fd;
      mFDs[mFDCount].fd = fd;
      mFDs[mFDCount].events = POLLIN;
+     mFDs[mFDCount].revents = 0;
  
      // Figure out the kinds of events the device reports.