commit 6437035400ae63a6f3eb2e375cb979bdd0037ba0
author Mathias Agopian <mathias@google.com> Wed Nov 09 14:36:31 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 09 14:36:31 2011 +0000
tree 94a80ca3bb544274a4d7f35d2249be376097e490
parent 3b2681bad989013154f90c4b9c31f074af1f822c
parent 393e2c1f7aad37e7851643df22e4810996c26d1f

am 393e2c1f: Merge "SensorService now always clamps the requested rate" into ics-mr1

* commit '393e2c1f7aad37e7851643df22e4810996c26d1f':
  SensorService now always clamps the requested rate

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index d2d2d8b..c2c6b4d 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -478,8 +478,9 @@
     if (ns < 0)
         return BAD_VALUE;
 
-    if (ns == 0) {
-        ns = sensor->getSensor().getMinDelayNs();
+    nsecs_t minDelayNs = sensor->getSensor().getMinDelayNs();
+    if (ns < minDelayNs) {
+        ns = minDelayNs;
     }
 
     if (ns < MINIMUM_EVENTS_PERIOD)