From 1cd700015318727d6d42236ab6274f1949fb08ba Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Wed, 21 Jul 2010 15:59:50 -0700
Subject: [PATCH] propagate sensor event rate properly

Change-Id: I32e67d30e4295285a6827956cc8161b2025d70bc
---
 services/sensorservice/SensorService.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index fec915362..a4f654976 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);