diff options
| -rw-r--r-- | core/jni/android_hardware_SensorManager.cpp | 6 | ||||
| -rw-r--r-- | include/gui/SensorEventQueue.h | 6 | ||||
| -rw-r--r-- | libs/gui/SensorEventQueue.cpp | 8 | ||||
| -rw-r--r-- | services/sensorservice/SensorService.cpp | 10 |
4 files changed, 22 insertions, 8 deletions
diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp index 232c8af..7b23418 100644 --- a/core/jni/android_hardware_SensorManager.cpp +++ b/core/jni/android_hardware_SensorManager.cpp @@ -100,13 +100,13 @@ sensors_destroy_queue(JNIEnv *env, jclass clazz, jint nativeQueue) static jboolean sensors_enable_sensor(JNIEnv *env, jclass clazz, - jint nativeQueue, jstring name, jint sensor, jint enable) + jint nativeQueue, jstring name, jint sensor, jint delay) { sp<SensorEventQueue> queue(reinterpret_cast<SensorEventQueue *>(nativeQueue)); if (queue == 0) return JNI_FALSE; status_t res; - if (enable) { - res = queue->enableSensor(sensor); + if (delay >= 0) { + res = queue->enableSensor(sensor, delay); } else { res = queue->disableSensor(sensor); } 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; 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 { diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp index fec9153..a4f6549 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp @@ -77,6 +77,9 @@ ANDROID_SINGLETON_STATIC_INSTANCE(BatteryService) // --------------------------------------------------------------------------- +// 100 events/s max +static const nsecs_t MINIMUM_EVENT_PERIOD = ms2ns(10); + SensorService::SensorService() : Thread(false), mSensorDevice(0), @@ -284,7 +287,6 @@ status_t SensorService::disable(const sp<SensorEventConnection>& connection, status_t err = NO_ERROR; Mutex::Autolock _l(mLock); SensorRecord* rec = mActiveSensors.valueFor(handle); - LOGW("sensor (handle=%d) is not enabled", handle); if (rec) { // see if this connection becomes inactive connection->removeSensor(handle); @@ -310,6 +312,12 @@ status_t SensorService::setRate(const sp<SensorEventConnection>& connection, if (mInitCheck != NO_ERROR) return mInitCheck; + if (ns < 0) + return BAD_VALUE; + + if (ns < MINIMUM_EVENT_PERIOD) + ns = MINIMUM_EVENT_PERIOD; + status_t err = NO_ERROR; Mutex::Autolock _l(mLock); |