diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-14 15:27:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-14 15:27:33 -0700 |
| commit | 09340a4bb99507d9b6bfbfc68a450d4d4f354d73 (patch) | |
| tree | 603df9bc5628adab2095e8d90014e71d84690d51 /include/ui | |
| parent | b3ffc78f3432344702e6f5232067ab624083cad2 (diff) | |
| parent | 4fe6c3e51be77e35f40872cdbca6c80f8f8b7ecb (diff) | |
| download | frameworks_base-09340a4bb99507d9b6bfbfc68a450d4d4f354d73.zip frameworks_base-09340a4bb99507d9b6bfbfc68a450d4d4f354d73.tar.gz frameworks_base-09340a4bb99507d9b6bfbfc68a450d4d4f354d73.tar.bz2 | |
Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
Diffstat (limited to 'include/ui')
| -rw-r--r-- | include/ui/InputDispatcher.h | 8 | ||||
| -rw-r--r-- | include/ui/InputTransport.h | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/ui/InputDispatcher.h b/include/ui/InputDispatcher.h index a06208a..d7e6254 100644 --- a/include/ui/InputDispatcher.h +++ b/include/ui/InputDispatcher.h @@ -25,7 +25,7 @@ #include <utils/Timers.h> #include <utils/RefBase.h> #include <utils/String8.h> -#include <utils/PollLoop.h> +#include <utils/Looper.h> #include <utils/Pool.h> #include <stddef.h> @@ -826,7 +826,7 @@ private: Mutex mLock; Allocator mAllocator; - sp<PollLoop> mPollLoop; + sp<Looper> mLooper; EventEntry* mPendingEvent; Queue<EventEntry> mInboundQueue; @@ -837,7 +837,7 @@ private: void dispatchOnceInnerLocked(nsecs_t keyRepeatTimeout, nsecs_t keyRepeatDelay, nsecs_t* nextWakeupTime); - // Enqueues an inbound event. Returns true if mPollLoop->wake() should be called. + // Enqueues an inbound event. Returns true if mLooper->wake() should be called. bool enqueueInboundEventLocked(EventEntry* entry); // App switch latency optimization. @@ -1010,7 +1010,7 @@ private: void abortDispatchCycleLocked(nsecs_t currentTime, const sp<Connection>& connection, bool broken); void drainOutboundQueueLocked(Connection* connection, DispatchEntry* firstDispatchEntryToDrain); - static bool handleReceiveCallback(int receiveFd, int events, void* data); + static int handleReceiveCallback(int receiveFd, int events, void* data); // Preempting input dispatch. bool preemptInputDispatchInnerLocked(); diff --git a/include/ui/InputTransport.h b/include/ui/InputTransport.h index 82831e2..dc9e27a 100644 --- a/include/ui/InputTransport.h +++ b/include/ui/InputTransport.h @@ -33,7 +33,6 @@ #include <semaphore.h> #include <ui/Input.h> #include <utils/Errors.h> -#include <utils/PollLoop.h> #include <utils/Timers.h> #include <utils/RefBase.h> #include <utils/String8.h> |