commit 9289bde5b9583a8c757bed4041238649aa146378
author Eric Laurent <elaurent@google.com> Tue Aug 18 12:49:17 2020 -0700
committer Eric Laurent <elaurent@google.com> Tue Aug 18 14:50:44 2020 -0700
tree a274b597596e4da75b37b1d7d54dbccb19f9202e
parent 242cf3379de223e0ae5c9ceeba05e6a397b44e2d

AudioFlinger: Check Effect HAL version for device effect compatibility

Add missing check on Effect HAL version to determine if an
implementaiton supports device effects. Only HALs after V 6.0
support this feature.

Bug: 164077570
Test: atest DeviceEffectTest#testCreateDeviceEffect
Change-Id: I9a72ed92a07099e9bad10cdf4474c7b918dce121

services/audioflinger/DeviceEffectManager.cpp

diff --git a/services/audioflinger/DeviceEffectManager.cpp b/services/audioflinger/DeviceEffectManager.cpp
index 5ff7215..620093d 100644
--- a/services/audioflinger/DeviceEffectManager.cpp
+++ b/services/audioflinger/DeviceEffectManager.cpp
@@ -115,10 +115,19 @@
 
 status_t AudioFlinger::DeviceEffectManager::checkEffectCompatibility(
         const effect_descriptor_t *desc) {
+    sp<EffectsFactoryHalInterface> effectsFactory = mAudioFlinger.getEffectsFactory();
+    if (effectsFactory == nullptr) {
+        return BAD_VALUE;
+    }
 
-    if ((desc->flags & EFFECT_FLAG_TYPE_MASK) != EFFECT_FLAG_TYPE_PRE_PROC
-        && (desc->flags & EFFECT_FLAG_TYPE_MASK) != EFFECT_FLAG_TYPE_POST_PROC) {
-        ALOGW("%s() non pre/post processing device effect %s", __func__, desc->name);
+    static const float sMinDeviceEffectHalVersion = 6.0;
+    float halVersion = effectsFactory->getHalVersion();
+
+    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) {
+        ALOGW("%s() non pre/post processing device effect %s or incompatible API version %f",
+                __func__, desc->name, halVersion);
         return BAD_VALUE;
     }