commit 11d74e328cd0c254db144393d664c9652e3a1d31
author Arthur Ishiguro <arthuri@google.com> Thu Feb 10 18:49:39 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 10 18:49:39 2022 +0000
tree 115e27a902ebe3e16064a9ad2b8fe53cf3ddc6e2
parent 2f5e4dcd253ac8689c43fc07a5422a592b18c87d
parent 91b4835adaaba1ea8d3b25f383a85d5044332e07

Merge "Fix cert-dcl16-c warnings"

sensors/aidl/default/Sensor.cpp

diff --git a/sensors/aidl/default/Sensor.cpp b/sensors/aidl/default/Sensor.cpp
index 50d8841..62193d6 100644
--- a/sensors/aidl/default/Sensor.cpp
+++ b/sensors/aidl/default/Sensor.cpp
@@ -52,10 +52,10 @@
 }
 
 void Sensor::batch(int64_t samplingPeriodNs) {
-    if (samplingPeriodNs < mSensorInfo.minDelayUs * 1000ll) {
-        samplingPeriodNs = mSensorInfo.minDelayUs * 1000ll;
-    } else if (samplingPeriodNs > mSensorInfo.maxDelayUs * 1000ll) {
-        samplingPeriodNs = mSensorInfo.maxDelayUs * 1000ll;
+    if (samplingPeriodNs < mSensorInfo.minDelayUs * 1000LL) {
+        samplingPeriodNs = mSensorInfo.minDelayUs * 1000LL;
+    } else if (samplingPeriodNs > mSensorInfo.maxDelayUs * 1000LL) {
+        samplingPeriodNs = mSensorInfo.maxDelayUs * 1000LL;
     }
 
     if (mSamplingPeriodNs != samplingPeriodNs) {