| commit | d430717d81ee3053db7c707a2ab5276e0f5c938f | [log] [tgz] |
|---|---|---|
| author | Arthur Ishiguro <arthuri@google.com> | Wed Jul 19 15:39:34 2023 +0000 |
| committer | Arthur Ishiguro <arthuri@google.com> | Thu Jul 20 15:24:35 2023 +0000 |
| tree | d175a8589c8da31ff1e702bb77ba8ce31244da25 | |
| parent | 7dae9c10f1588f48da9ce8015b75ebdc54be8a8d [diff] [blame] |
Fix return value of AidlSensorHalWrapper::configureDirectChannel Fixes: 287721163 Test: Test on device Change-Id: I9585d8c1a285e27ed8c1f506dd9ac24a47631f93 Merged-In: I9585d8c1a285e27ed8c1f506dd9ac24a47631f93
diff --git a/services/sensorservice/AidlSensorHalWrapper.cpp b/services/sensorservice/AidlSensorHalWrapper.cpp index f5b360f..e60db93 100644 --- a/services/sensorservice/AidlSensorHalWrapper.cpp +++ b/services/sensorservice/AidlSensorHalWrapper.cpp
@@ -308,8 +308,12 @@ } int32_t token; - mSensors->configDirectReport(sensorHandle, channelHandle, rate, &token); - return token; + status_t status = convertToStatus( + mSensors->configDirectReport(sensorHandle, channelHandle, rate, &token)); + if (status == OK && rate != ISensors::RateLevel::STOP) { + status = static_cast<status_t>(token); + } + return status; } void AidlSensorHalWrapper::writeWakeLockHandled(uint32_t count) {