commit eeda2b2e6559799a25e7e643978c63c9bb5a576f
author Shunkai Yao <yaoshunkai@google.com> Tue Jan 07 21:44:51 2025 +0000
committer Shunkai Yao <yaoshunkai@google.com> Tue Jan 07 16:05:40 2025 -0800
tree dee1c90d1e6889a60019fc43c7d8a705f0038932
parent bbfc9866086f8a20c8b1a082379a6a1a62c08639

Effect AIDL VTS: skip state check after STOP if draining is not supported

some HAL implementations may need to do draining before transit to IDLE
Draining state introduced in kDrainSupportedVersion

Flag: EXEMPT bugfix
Bug: 386161796
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: I74d3d674950cbdaf4ae5e6d839dd06f96b2e8142

audio/aidl/vts/EffectHelper.h

diff --git a/audio/aidl/vts/EffectHelper.h b/audio/aidl/vts/EffectHelper.h
index eedac3d..8ceb56b 100644
--- a/audio/aidl/vts/EffectHelper.h
+++ b/audio/aidl/vts/EffectHelper.h
@@ -47,6 +47,7 @@
 using aidl::android::hardware::audio::effect::getRange;
 using aidl::android::hardware::audio::effect::IEffect;
 using aidl::android::hardware::audio::effect::isRangeValid;
+using aidl::android::hardware::audio::effect::kDrainSupportedVersion;
 using aidl::android::hardware::audio::effect::kEffectTypeUuidSpatializer;
 using aidl::android::hardware::audio::effect::kEventFlagDataMqNotEmpty;
 using aidl::android::hardware::audio::effect::kEventFlagDataMqUpdate;
@@ -195,8 +196,11 @@
                 ASSERT_TRUE(expectState(effect, State::PROCESSING));
                 break;
             case CommandId::STOP:
-                ASSERT_TRUE(expectState(effect, State::IDLE) ||
-                            expectState(effect, State::DRAINING));
+                // Enforce the state checking after kDrainSupportedVersion
+                if (getHalVersion(effect) >= kDrainSupportedVersion) {
+                    ASSERT_TRUE(expectState(effect, State::IDLE) ||
+                                expectState(effect, State::DRAINING));
+                }
                 break;
             case CommandId::RESET:
                 ASSERT_TRUE(expectState(effect, State::IDLE));
@@ -518,6 +522,11 @@
         }
     }
 
+    static int getHalVersion(const std::shared_ptr<IEffect>& effect) {
+        int version = 0;
+        return (effect && effect->getInterfaceVersion(&version).isOk()) ? version : 0;
+    }
+
     bool mIsSpatializer;
     Descriptor mDescriptor;
     size_t mInputFrameSize, mOutputFrameSize;