Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11d74e32 authored by Arthur Ishiguro's avatar Arthur Ishiguro Committed by Android (Google) Code Review
Browse files

Merge "Fix cert-dcl16-c warnings"

parents 2f5e4dcd 91b4835a

sensors/aidl/default/Sensor.cpp

+4 −4
Original line number Diff line number Diff line
@@ -52,10 +52,10 @@ const SensorInfo& Sensor::getSensorInfo() const { 
}



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) {