tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: I52d5d846d5192c711a6c129aa1867f2f83facaad
This commit is contained in:
Chih-hung Hsieh 2022-02-10 18:46:42 +00:00 committed by Automerger Merge Worker
commit 2f22222a1c
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
identity/support/include/cppbor/cppbor.h
View file

@ -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;
};

5
media/omx/1.0/vts/functional/common/media_hidl_test_common.h
View file

@ -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);
}
}

8
sensors/common/default/2.X/Sensor.cpp
View file

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