commit 6528410dbdffe76592a156de03200f30191542c5
author Jim Kaye <jameskaye@google.com> Mon May 08 20:07:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 08 20:07:26 2017 +0000
tree 6d9887efa3bd62acb0e6a3e0302f57236b8464c8
parent 063a517cd3745145e7d232a94b10ad29d3067f29
parent 663720b29f412756b8599897df9f8e32eb930be2

Fix enforcement of sensor's slowest rate
am: 663720b29f

Change-Id: I31ff9da171baa83318bc794553c7057b18be2dec

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index c5bbeee..d60768c 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -1250,7 +1250,7 @@
     }
 
     // Check maximum delay for the sensor.
-    nsecs_t maxDelayNs = sensor->getSensor().getMaxDelay() * 1000;
+    nsecs_t maxDelayNs = sensor->getSensor().getMaxDelay() * 1000LL;
     if (maxDelayNs > 0 && (samplingPeriodNs > maxDelayNs)) {
         samplingPeriodNs = maxDelayNs;
     }
@@ -1511,4 +1511,3 @@
 }
 
 }; // namespace android
-