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/SensorManager.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/SensorManager.h')
| -rw-r--r-- | include/gui/SensorManager.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/gui/SensorManager.h b/include/gui/SensorManager.h index 0d65334..e1b1a7b 100644 --- a/include/gui/SensorManager.h +++ b/include/gui/SensorManager.h @@ -47,13 +47,13 @@ public: SensorManager(); ~SensorManager(); - ssize_t getSensorList(Sensor**) const; - Sensor* getDefaultSensor(int type); + ssize_t getSensorList(Sensor const* const** list) const; + Sensor const* getDefaultSensor(int type); sp<SensorEventQueue> createEventQueue(); private: sp<ISensorServer> mSensorServer; - Sensor* mSensorList; + Sensor const** mSensorList; Vector<Sensor> mSensors; }; |