commit 2adce347223935df0324022e1a52463bfd2dffcc
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 09 17:14:38 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 09 17:14:38 2020 +0000
tree e9ec0c9746235494b224c96644ef790a8b1cce73
parent ee01c9ec22b1fd6bc12db85e8007b69b2b9dd12b
parent cd4d9abdcc710462dfb8efa6ce3f5753f1fc7573

Merge "Don't modify -1 sensorHandle value" into rvc-dev

sensors/common/default/2.X/multihal/HalProxy.cpp

diff --git a/sensors/common/default/2.X/multihal/HalProxy.cpp b/sensors/common/default/2.X/multihal/HalProxy.cpp
index 518e138..869c033 100644
--- a/sensors/common/default/2.X/multihal/HalProxy.cpp
+++ b/sensors/common/default/2.X/multihal/HalProxy.cpp
@@ -260,9 +260,14 @@
                                           RateLevel rate, configDirectReport_cb _hidl_cb) {
     if (mDirectChannelSubHal == nullptr) {
         _hidl_cb(Result::INVALID_OPERATION, -1 /* reportToken */);
+    } else if (sensorHandle == -1 && rate != RateLevel::STOP) {
+        _hidl_cb(Result::BAD_VALUE, -1 /* reportToken */);
     } else {
-        mDirectChannelSubHal->configDirectReport(clearSubHalIndex(sensorHandle), channelHandle,
-                                                 rate, _hidl_cb);
+        // -1 denotes all sensors should be disabled
+        if (sensorHandle != -1) {
+            sensorHandle = clearSubHalIndex(sensorHandle);
+        }
+        mDirectChannelSubHal->configDirectReport(sensorHandle, channelHandle, rate, _hidl_cb);
     }
     return Return<void>();
 }