diff options
| author | 2023-07-20 18:02:23 +0000 | |
|---|---|---|
| committer | 2023-07-20 18:02:23 +0000 | |
| commit | 85cf4c92f0fa2912aefc9b5c32e24700d4dd7cbe (patch) | |
| tree | e728680ac437f3ef2d086369b0ab6eeb70c12fcf | |
| parent | b7a9610d164f8cb23810ef63073eb83cdc7bb3d4 (diff) | |
| parent | d430717d81ee3053db7c707a2ab5276e0f5c938f (diff) | |
Fix return value of AidlSensorHalWrapper::configureDirectChannel am: d430717d81
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24148050
Change-Id: Ie2a766853ebb2505e671516e8be5832825513dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/sensorservice/AidlSensorHalWrapper.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/sensorservice/AidlSensorHalWrapper.cpp b/services/sensorservice/AidlSensorHalWrapper.cpp index f5b360f3b6..e60db93431 100644 --- a/services/sensorservice/AidlSensorHalWrapper.cpp +++ b/services/sensorservice/AidlSensorHalWrapper.cpp @@ -308,8 +308,12 @@ status_t AidlSensorHalWrapper::configureDirectChannel(int32_t sensorHandle, int3 } 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) { |