commit | 916352ec6b9de5db5958d58df9cd9de9b8664753 | [log] [tgz] |
---|---|---|
author | Brian Duddie <bduddie@google.com> | Wed Apr 27 03:45:59 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 27 03:45:59 2022 +0000 |
tree | ec7d933f7404dc3c7daa822d74965cd72d82912a | |
parent | d115132fcb55bc290ae9235f832cc8898fe09bc2 [diff] | |
parent | b0625b0c96c0b330ba826517ed396d8bd72df76b [diff] |
Fix sub-HAL handle in dynamic sensor meta events am: 280fd70dc4 am: f36e358316 am: b0625b0c96 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2064302 Change-Id: I5ddad6a37ce365b5a4c227bc6188b2eeec85b24a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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) {