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

Commit 2f22222a authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Automerger Merge Worker
Browse files

Merge "Fix cert-dcl16-c warnings" am: 2d028894 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1978297

Change-Id: I52d5d846d5192c711a6c129aa1867f2f83facaad
parents 8c9dc1b2 2d028894

identity/support/include/cppbor/cppbor.h

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ class Nint : public Int { 
    virtual std::unique_ptr<Item> clone() const override { return std::make_unique<Nint>(mValue); }



  private:

    uint64_t addlInfo() const { return -1ll - mValue; }

    uint64_t addlInfo() const { return -1LL - mValue; }



    int64_t mValue;

};

media/omx/1.0/vts/functional/common/media_hidl_test_common.h

+2 −3
Original line number Diff line number Diff line
@@ -203,9 +203,8 @@ struct CodecObserver : public IOmxObserver { 
            }

            int64_t delayUs = finishBy - android::ALooper::GetNowUs();

            if (delayUs < 0) return toStatus(android::TIMED_OUT);

            (timeoutUs < 0)

                ? msgCondition.wait(msgLock)

                : msgCondition.waitRelative(msgLock, delayUs * 1000ll);

            (timeoutUs < 0) ? msgCondition.wait(msgLock)

                            : msgCondition.waitRelative(msgLock, delayUs * 1000LL);

        }

    }

sensors/common/default/2.X/Sensor.cpp

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



void Sensor::batch(int64_t samplingPeriodNs) {

    if (samplingPeriodNs < mSensorInfo.minDelay * 1000ll) {

        samplingPeriodNs = mSensorInfo.minDelay * 1000ll;

    } else if (samplingPeriodNs > mSensorInfo.maxDelay * 1000ll) {

        samplingPeriodNs = mSensorInfo.maxDelay * 1000ll;

    if (samplingPeriodNs < mSensorInfo.minDelay * 1000LL) {

        samplingPeriodNs = mSensorInfo.minDelay * 1000LL;

    } else if (samplingPeriodNs > mSensorInfo.maxDelay * 1000LL) {

        samplingPeriodNs = mSensorInfo.maxDelay * 1000LL;

    }



    if (mSamplingPeriodNs != samplingPeriodNs) {