diff options
| author | Mathias Agopian <mathias@google.com> | 2010-07-21 18:10:22 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2010-07-21 18:10:22 -0700 |
| commit | 50558b956157dad980441bf4fb44931ce834e36b (patch) | |
| tree | 2d208a78ab3a1c77d91751b8bbe5cafd9415f0d8 /include/gui/SensorEventQueue.h | |
| parent | c1b11b1b37d0692bd3c63575c9f2c0d9fa566602 (diff) | |
| parent | bc54e63c84a517f0dca88ba900ff2b56719f685b (diff) | |
| download | frameworks_base-50558b956157dad980441bf4fb44931ce834e36b.zip frameworks_base-50558b956157dad980441bf4fb44931ce834e36b.tar.gz frameworks_base-50558b956157dad980441bf4fb44931ce834e36b.tar.bz2 | |
resolved conflicts for merge of bc54e63c to master
Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1
Diffstat (limited to 'include/gui/SensorEventQueue.h')
| -rw-r--r-- | include/gui/SensorEventQueue.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/gui/SensorEventQueue.h b/include/gui/SensorEventQueue.h index d8d8128..bb03c12 100644 --- a/include/gui/SensorEventQueue.h +++ b/include/gui/SensorEventQueue.h @@ -42,6 +42,7 @@ namespace android { class ISensorEventConnection; class Sensor; +class PollLoop; // ---------------------------------------------------------------------------- @@ -56,13 +57,21 @@ public: ssize_t write(ASensorEvent const* events, size_t numEvents); ssize_t read(ASensorEvent* events, size_t numEvents); + status_t waitForEvent() const; + status_t wake() const; + status_t enableSensor(Sensor const* sensor) const; status_t disableSensor(Sensor const* sensor) const; + status_t enableSensor(int32_t handle) const; + status_t disableSensor(int32_t handle) const; status_t setEventRate(Sensor const* sensor, nsecs_t ns) const; private: + sp<PollLoop> getPollLoop() const; sp<ISensorEventConnection> mSensorEventConnection; sp<SensorChannel> mSensorChannel; + mutable Mutex mLock; + mutable sp<PollLoop> mPollLoop; }; // ---------------------------------------------------------------------------- |