diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-14 15:32:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-14 15:32:03 -0700 |
| commit | 14bc6b5d0677e5c454a67775c852f90389bb4567 (patch) | |
| tree | 5bdb785c2a486787fb2d4294980b51df69765d62 /include/gui/SensorEventQueue.h | |
| parent | 48a862407dda482450bdfd5aa2a2cd8b3e8e38dd (diff) | |
| parent | 09340a4bb99507d9b6bfbfc68a450d4d4f354d73 (diff) | |
| download | frameworks_base-14bc6b5d0677e5c454a67775c852f90389bb4567.zip frameworks_base-14bc6b5d0677e5c454a67775c852f90389bb4567.tar.gz frameworks_base-14bc6b5d0677e5c454a67775c852f90389bb4567.tar.bz2 | |
am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
Merge commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73' into gingerbread-plus-aosp
* commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73':
Replace epoll() with poll() and rename PollLoop to Looper.
Diffstat (limited to 'include/gui/SensorEventQueue.h')
| -rw-r--r-- | include/gui/SensorEventQueue.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/gui/SensorEventQueue.h b/include/gui/SensorEventQueue.h index 6581ae3..97dd391 100644 --- a/include/gui/SensorEventQueue.h +++ b/include/gui/SensorEventQueue.h @@ -42,7 +42,7 @@ namespace android { class ISensorEventConnection; class Sensor; -class PollLoop; +class Looper; // ---------------------------------------------------------------------------- @@ -69,11 +69,11 @@ public: status_t disableSensor(int32_t handle) const; private: - sp<PollLoop> getPollLoop() const; + sp<Looper> getLooper() const; sp<ISensorEventConnection> mSensorEventConnection; sp<SensorChannel> mSensorChannel; mutable Mutex mLock; - mutable sp<PollLoop> mPollLoop; + mutable sp<Looper> mLooper; }; // ---------------------------------------------------------------------------- |