commit 393e2c1f7aad37e7851643df22e4810996c26d1f
author Mathias Agopian <mathias@google.com> Tue Nov 08 17:20:59 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 08 17:20:59 2011 -0800
tree 0fdbbbfacecede0bbf566f53a008426dbc9c821f
parent 3af8b88d032011fdbc6c498cf3f3881281cff999
parent eed2373321a84560961884697b4bd92d0ee9f7c9

Merge "SensorService now always clamps the requested rate" into ics-mr1

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)