commit 31aef21ec8e18917c953e08d49e657a54f8d5607
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 27 16:21:29 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 27 16:21:29 2022 +0000
tree d67f2074656e1438a250df607a8e826548fb280f
parent 280fd70dc4bb8ad5c0274d69695f286cb15dda3f
parent 8ef2bcb6d9d193b42da835711a56cad64da021a4

Merge changes from topic "227137943"

* changes:
  VTS tests for USB AIDL interface
  Migrate IUsb to AIDL

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

diff --git a/sensors/common/default/2.X/multihal/HalProxyCallback.cpp b/sensors/common/default/2.X/multihal/HalProxyCallback.cpp
index 3c1b17c..addefe8 100644
--- a/sensors/common/default/2.X/multihal/HalProxyCallback.cpp
+++ b/sensors/common/default/2.X/multihal/HalProxyCallback.cpp
@@ -68,6 +68,10 @@
     std::vector<V2_1::Event> eventsOut;
     for (V2_1::Event event : events) {
         event.sensorHandle = setSubHalIndex(event.sensorHandle, mSubHalIndex);
+        if (event.sensorType == V2_1::SensorType::DYNAMIC_SENSOR_META) {
+            event.u.dynamic.sensorHandle =
+                    setSubHalIndex(event.u.dynamic.sensorHandle, mSubHalIndex);
+        }
         eventsOut.push_back(event);
         const V2_1::SensorInfo& sensor = mCallback->getSensorInfo(event.sensorHandle);
         if ((sensor.flags & V1_0::SensorFlagBits::WAKE_UP) != 0) {