summaryrefslogtreecommitdiffstats
path: root/libs/gui/SensorEventQueue.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-07-21 18:13:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-21 18:13:39 -0700
commit5c49ec30b57a18ac022601473c9524f40554c9cf (patch)
tree9ac6fd8c1c7315ca8d785d009ce36345eb38c429 /libs/gui/SensorEventQueue.cpp
parent409c484b6d235b52b69e87a44b1f51a1ac5ca1f9 (diff)
parent1f2ec4070aa9c999d41dc50a892a896e894c5710 (diff)
downloadframeworks_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 'libs/gui/SensorEventQueue.cpp')
-rw-r--r--libs/gui/SensorEventQueue.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/gui/SensorEventQueue.cpp b/libs/gui/SensorEventQueue.cpp
index cc98656..4b46842 100644
--- a/libs/gui/SensorEventQueue.cpp
+++ b/libs/gui/SensorEventQueue.cpp
@@ -114,8 +114,12 @@ status_t SensorEventQueue::disableSensor(Sensor const* sensor) const {
return mSensorEventConnection->enableDisable(sensor->getHandle(), false);
}
-status_t SensorEventQueue::enableSensor(int32_t handle) const {
- return mSensorEventConnection->enableDisable(handle, true);
+status_t SensorEventQueue::enableSensor(int32_t handle, int32_t ms) const {
+ status_t err = mSensorEventConnection->enableDisable(handle, true);
+ if (err == NO_ERROR) {
+ mSensorEventConnection->setEventRate(handle, ms2ns(ms));
+ }
+ return err;
}
status_t SensorEventQueue::disableSensor(int32_t handle) const {