Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 20:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Don't modify -1 sensorHandle value" into rvc-dev am: 2adce34722

Browse Source 
Change-Id: I6a79467631e9686452c6255a26eca11e37897eac
This commit is contained in:
TreeHugger Robot
2020-04-09 17:34:46 +00:00
committed by Automerger Merge Worker
parent acc50061f8 2adce34722
commit 613d716a4e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sensors/common/default/2.X/multihal/HalProxy.cpp
View File

@@ -260,9 +260,14 @@ Return<void> HalProxy::configDirectReport(int32_t sensorHandle, int32_t channelH
RateLevel rate, configDirectReport_cb _hidl_cb) { RateLevel rate, configDirectReport_cb _hidl_cb) {
if (mDirectChannelSubHal == nullptr) { if (mDirectChannelSubHal == nullptr) {
_hidl_cb(Result::INVALID_OPERATION, -1 /* reportToken */); _hidl_cb(Result::INVALID_OPERATION, -1 /* reportToken */);
} else if (sensorHandle == -1 && rate != RateLevel::STOP) {
_hidl_cb(Result::BAD_VALUE, -1 /* reportToken */);
} else { } else {
mDirectChannelSubHal->configDirectReport(clearSubHalIndex(sensorHandle), channelHandle, // -1 denotes all sensors should be disabled
rate, _hidl_cb); if (sensorHandle != -1) {
sensorHandle = clearSubHalIndex(sensorHandle);
}
mDirectChannelSubHal->configDirectReport(sensorHandle, channelHandle, rate, _hidl_cb);
} }
return Return<void>(); return Return<void>();
} }