commit 1aabf5b012db3928481b0076acd57fea581d8c19
author Arthur Ishiguro <arthuri@google.com> Wed Jul 19 15:39:34 2023 +0000
committer Arthur Ishiguro <arthuri@google.com> Wed Jul 19 18:55:07 2023 +0000
tree 300b1d43fea94d44773dc8d13a578b4961eff7c7
parent 93dcdcbfb153e175c4081425e74d7f49cf217bdc

Fix return value of AidlSensorHalWrapper::configureDirectChannel

Bug: 287721163
Test: Test on device
Change-Id: I9585d8c1a285e27ed8c1f506dd9ac24a47631f93

services/sensorservice/AidlSensorHalWrapper.cpp

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