commit e3c8234765050023b8a588607f819e8cc41a6363
author Mathias Agopian <mathias@google.com> Wed Jul 21 15:59:50 2010 -0700
committer Mathias Agopian <mathias@google.com> Wed Jul 21 16:09:39 2010 -0700
tree 8bd219d95baa89463e0fc62861c008a6380e828b
parent 49f2aee90c9c5ad56afeb9f87fbe57b6859743a5

propagate sensor event rate properly

Change-Id: I32e67d30e4295285a6827956cc8161b2025d70bc

include/gui/SensorEventQueue.h

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 @@
 
     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;

libs/gui/SensorEventQueue.cpp

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 @@
     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 {