commit d7ea4091707602c2abbbc039c873a93b7fe84968
author Shunkai Yao <yaoshunkai@google.com> Mon Dec 12 00:44:33 2022 +0000
committer Shunkai Yao <yaoshunkai@google.com> Mon Dec 12 06:36:40 2022 +0000
tree 9b6f86eec08ad0cddaedcd495a7d4e9f8859d1d6
parent c9c108d3ae58b528646a6cb23ef07fd42302dd3b

Update DeviceEffectManager with AudioHalVersionInfo

Bug: 261129656
Test: Run the change with Cuttlefish and Panther.
Change-Id: Idd9958fef8797f89c9ef80f882a2a2f30d4c1a17

services/audioflinger/DeviceEffectManager.cpp

diff --git a/services/audioflinger/DeviceEffectManager.cpp b/services/audioflinger/DeviceEffectManager.cpp
index 5bd5d43..3a8c1bc 100644
--- a/services/audioflinger/DeviceEffectManager.cpp
+++ b/services/audioflinger/DeviceEffectManager.cpp
@@ -30,7 +30,7 @@
 
 namespace android {
 
-using media::AudioHalVersion;
+using detail::AudioHalVersionInfo;
 using media::IEffectClient;
 
 void AudioFlinger::DeviceEffectManager::createAudioPatch(audio_patch_handle_t handle,
@@ -131,14 +131,12 @@
         return BAD_VALUE;
     }
 
-    static AudioHalVersion sMinDeviceEffectHalVersion;
-    sMinDeviceEffectHalVersion.type = AudioHalVersion::Type::HIDL;
-    sMinDeviceEffectHalVersion.major = 6;
-    sMinDeviceEffectHalVersion.minor = 0;
-    AudioHalVersion halVersion = effectsFactory->getHalVersion();
+    static AudioHalVersionInfo sMinDeviceEffectHalVersion =
+            AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 6, 0);
+    AudioHalVersionInfo halVersion = effectsFactory->getHalVersion();
 
-    // We can trust AIDL generated AudioHalVersion comparison operator (based on std::tie) as long
-    // as the type, major and minor sequence doesn't change in the definition.
+    // We can trust AIDL generated AudioHalVersionInfo comparison operator (based on std::tie) as
+    // long as the type, major and minor sequence doesn't change in the definition.
     if (((desc->flags & EFFECT_FLAG_TYPE_MASK) != EFFECT_FLAG_TYPE_PRE_PROC
             && (desc->flags & EFFECT_FLAG_TYPE_MASK) != EFFECT_FLAG_TYPE_POST_PROC)
             || halVersion < sMinDeviceEffectHalVersion) {