commit 49b20db391a4f29c0bcd9bca5e19f048e31b8418
author Jim Kaye <jameskaye@google.com> Mon May 08 20:09:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 08 20:09:55 2017 +0000
tree db20de0ab14287558d673f481cb5e574b58ee2cf
parent bd32a5d7d27158cc31016fc1de39adf7ee2cd06f
parent 6528410dbdffe76592a156de03200f30191542c5

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

Change-Id: I3026783f4b9442d59939b2e2bf1755971a517b15

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index d0e27d3..b5baba8 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -1251,7 +1251,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;
     }
@@ -1512,4 +1512,3 @@
 }
 
 }; // namespace android
-