summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-20 23:15:23 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-20 23:15:23 +0000
commit1e14cdfb0e1c2e94f245362f990ce16326e99528 (patch)
treed175a8589c8da31ff1e702bb77ba8ce31244da25
parentf386ec6e20273c2f5502b8a08b414be57e07fa80 (diff)
parentd430717d81ee3053db7c707a2ab5276e0f5c938f (diff)
downloadnative-1e14cdfb0e1c2e94f245362f990ce16326e99528.tar.gz
Snap for 10535824 from d430717d81ee3053db7c707a2ab5276e0f5c938f to udc-d1-release
Change-Id: Ib91d015ceb157999ee63069158e0a0eaa46aab75
-rw-r--r--services/sensorservice/AidlSensorHalWrapper.cpp8
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) {