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

* commit '6437035400ae63a6f3eb2e375cb979bdd0037ba0':
  SensorService now always clamps the requested rate
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 11adbe2..7d5a761 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)