commit ac5e55c10f4e0f27b8e9940dc1c7fcae039de4da
author qctecmdr <qctecmdr@localhost> Sun Aug 11 03:05:22 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Aug 11 03:05:22 2019 -0700
tree 1ebc6d3339bae19d6bdcf747baff22a02a7a7fb3
parent 68e8a9d32d0b4306410a1983a504327f28014743
parent 68305836c99e3c3e35b8d7e8d005ad57ed8f7d2c

Merge "configs: Add speaker-safe mixer paths on Kona"

configs/atoll/atoll.mk

diff --git a/configs/atoll/atoll.mk b/configs/atoll/atoll.mk
index ea2501f..e8b593e 100755
--- a/configs/atoll/atoll.mk
+++ b/configs/atoll/atoll.mk
@@ -266,6 +266,15 @@
     android.hardware.audio.effect@4.0 \
     android.hardware.audio.effect@4.0-impl
 
+# enable audio hidl hal 5.0
+PRODUCT_PACKAGES += \
+    android.hardware.audio@5.0 \
+    android.hardware.audio.common@5.0 \
+    android.hardware.audio.common@5.0-util \
+    android.hardware.audio@5.0-impl \
+    android.hardware.audio.effect@5.0 \
+    android.hardware.audio.effect@5.0-impl
+
 PRODUCT_PACKAGES_ENG += \
     VoicePrintTest \
     VoicePrintDemo

configs/lito/lito.mk

diff --git a/configs/lito/lito.mk b/configs/lito/lito.mk
index a7fb06f..230c4d5 100644
--- a/configs/lito/lito.mk
+++ b/configs/lito/lito.mk
@@ -446,6 +446,15 @@
     vendor.qti.hardware.audiohalext@1.0-impl \
     vendor.qti.hardware.audiohalext-utils
 
+# enable audio hidl hal 5.0
+PRODUCT_PACKAGES += \
+    android.hardware.audio@5.0 \
+    android.hardware.audio.common@5.0 \
+    android.hardware.audio.common@5.0-util \
+    android.hardware.audio@5.0-impl \
+    android.hardware.audio.effect@5.0 \
+    android.hardware.audio.effect@5.0-impl
+
 PRODUCT_PACKAGES_ENG += \
     VoicePrintTest \
     VoicePrintDemo

configs/msm8998/msm8998.mk

diff --git a/configs/msm8998/msm8998.mk b/configs/msm8998/msm8998.mk
index a54f32c..d8a5044 100644
--- a/configs/msm8998/msm8998.mk
+++ b/configs/msm8998/msm8998.mk
@@ -314,3 +314,12 @@
     android.hardware.audio@4.0-impl \
     android.hardware.audio.effect@4.0 \
     android.hardware.audio.effect@4.0-impl
+
+# enable audio hidl hal 5.0
+PRODUCT_PACKAGES += \
+    android.hardware.audio@5.0 \
+    android.hardware.audio.common@5.0 \
+    android.hardware.audio.common@5.0-util \
+    android.hardware.audio@5.0-impl \
+    android.hardware.audio.effect@5.0 \
+    android.hardware.audio.effect@5.0-impl

configs/qssi/qssi.mk

diff --git a/configs/qssi/qssi.mk b/configs/qssi/qssi.mk
index 653c177..9ac35b3 100644
--- a/configs/qssi/qssi.mk
+++ b/configs/qssi/qssi.mk
@@ -142,6 +142,13 @@
     vendor.qti.hardware.audiohalext@1.0 \
     vendor.qti.hardware.audiohalext-utils
 
+# enable audio hidl hal 5.0
+PRODUCT_PACKAGES += \
+    android.hardware.audio@5.0 \
+    android.hardware.audio.common@5.0 \
+    android.hardware.audio.common@5.0-util \
+    android.hardware.audio.effect@5.0 \
+
 PRODUCT_PACKAGES_ENG += \
     VoicePrintTest \
     VoicePrintDemo

configs/sdm660/sdm660.mk

diff --git a/configs/sdm660/sdm660.mk b/configs/sdm660/sdm660.mk
index b035d1e..bcd61ee 100644
--- a/configs/sdm660/sdm660.mk
+++ b/configs/sdm660/sdm660.mk
@@ -326,6 +326,15 @@
     android.hardware.audio.effect@4.0 \
     android.hardware.audio.effect@4.0-impl
 
+# enable audio hidl hal 5.0
+PRODUCT_PACKAGES += \
+    android.hardware.audio@5.0 \
+    android.hardware.audio.common@5.0 \
+    android.hardware.audio.common@5.0-util \
+    android.hardware.audio@5.0-impl \
+    android.hardware.audio.effect@5.0 \
+    android.hardware.audio.effect@5.0-impl
+
 PRODUCT_PACKAGES_ENG += \
     VoicePrintTest \
     VoicePrintDemo

configs/trinket/trinket.mk

diff --git a/configs/trinket/trinket.mk b/configs/trinket/trinket.mk
index 9bcdfe8..d083d75 100644
--- a/configs/trinket/trinket.mk
+++ b/configs/trinket/trinket.mk
@@ -318,6 +318,15 @@
     android.hardware.audio.effect@4.0 \
     android.hardware.audio.effect@4.0-impl
 
+# enable audio hidl hal 5.0
+PRODUCT_PACKAGES += \
+    android.hardware.audio@5.0 \
+    android.hardware.audio.common@5.0 \
+    android.hardware.audio.common@5.0-util \
+    android.hardware.audio@5.0-impl \
+    android.hardware.audio.effect@5.0 \
+    android.hardware.audio.effect@5.0-impl
+
 PRODUCT_PACKAGES_ENG += \
     VoicePrintTest \
     VoicePrintDemo

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index eba90ac..56dbcb9 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2255,9 +2255,11 @@
 {
    bool ret=false;
    if ((out_snd_device == SND_DEVICE_OUT_BT_SCO ||
-        out_snd_device == SND_DEVICE_OUT_BT_SCO_WB) ||
+        out_snd_device == SND_DEVICE_OUT_BT_SCO_WB ||
+        out_snd_device == SND_DEVICE_OUT_BT_SCO_SWB) ||
         in_snd_device == SND_DEVICE_IN_BT_SCO_MIC_WB_NREC ||
         in_snd_device == SND_DEVICE_IN_BT_SCO_MIC_WB ||
+        in_snd_device == SND_DEVICE_IN_BT_SCO_MIC_SWB ||
         in_snd_device == SND_DEVICE_IN_BT_SCO_MIC_NREC ||
         in_snd_device == SND_DEVICE_IN_BT_SCO_MIC)
         ret = true;