diff options
author | Mathias Agopian <mathias@google.com> | 2010-07-21 18:13:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-21 18:13:39 -0700 |
commit | 5c49ec30b57a18ac022601473c9524f40554c9cf (patch) | |
tree | 9ac6fd8c1c7315ca8d785d009ce36345eb38c429 /include | |
parent | 409c484b6d235b52b69e87a44b1f51a1ac5ca1f9 (diff) | |
parent | 1f2ec4070aa9c999d41dc50a892a896e894c5710 (diff) | |
download | frameworks_base-5c49ec30b57a18ac022601473c9524f40554c9cf.zip frameworks_base-5c49ec30b57a18ac022601473c9524f40554c9cf.tar.gz frameworks_base-5c49ec30b57a18ac022601473c9524f40554c9cf.tar.bz2 |
am 1f2ec407: am 23e8de26: propagate sensor event rate properly
Merge commit '1f2ec4070aa9c999d41dc50a892a896e894c5710'
* commit '1f2ec4070aa9c999d41dc50a892a896e894c5710':
propagate sensor event rate properly
Diffstat (limited to 'include')
-rw-r--r-- | include/gui/SensorEventQueue.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/gui/SensorEventQueue.h b/include/gui/SensorEventQueue.h index bb03c12..ad36dac 100644 --- a/include/gui/SensorEventQueue.h +++ b/include/gui/SensorEventQueue.h @@ -62,10 +62,12 @@ public: 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; + // these are here only to support SensorManager.java + status_t enableSensor(int32_t handle, int32_t ms) const; + status_t disableSensor(int32_t handle) const; + private: sp<PollLoop> getPollLoop() const; sp<ISensorEventConnection> mSensorEventConnection; |