commit 28b050811f3bf126fee3f8f1fc027c43b890d0a1
author Arthur Ishiguro <arthuri@google.com> Tue Apr 12 16:26:20 2022 +0000
committer Arthur Ishiguro <arthuri@google.com> Tue Apr 12 22:52:28 2022 +0000
tree 89124b07d2cbd06794aeea73c4bb88f93696a78e
parent 7f3ca03231530d1945c651ddad8ae6c0c5890be6

Fix registerDirectChannel in HAL wrappers

Bug: 228645167
Test: CTS+VTS
Change-Id: I14348a7fe98a9681bc03109af8610c0aab679265

services/sensorservice/SensorDevice.cpp

diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp
index a0e30ac..53a3025 100644
--- a/services/sensorservice/SensorDevice.cpp
+++ b/services/sensorservice/SensorDevice.cpp
@@ -766,7 +766,13 @@
     if (mHalWrapper == nullptr) return NO_INIT;
     Mutex::Autolock _l(mLock);
 
-    return mHalWrapper->registerDirectChannel(memory, nullptr);
+    int32_t channelHandle;
+    status_t status = mHalWrapper->registerDirectChannel(memory, &channelHandle);
+    if (status != OK) {
+        channelHandle = -1;
+    }
+
+    return channelHandle;
 }
 
 void SensorDevice::unregisterDirectChannel(int32_t channelHandle) {