commit 9d6679a89ddf23452bb7d370e6fc62ec1183c456
author Aniket Kumar Lata <alata@codeaurora.org> Wed Apr 11 18:13:23 2018 -0700
committer Eric Laurent <elaurent@google.com> Wed Apr 25 19:06:53 2018 -0700
tree a3d2438903ab0d9aa83349243bd7c0d5c0545bd2
parent 5b30b062ee1cd00e0e5823087a2baeee8ebcce21

hal: Update ACDB device id retrieval for speaker protection

Modify audio HAL to retrieve acdb device ids in
a uniform manner. Remove duplicate function for
fetching acdb device.

Bug: 77292011
Test: manual audio regression tests on B1

Change-Id: I1a26c0095c7a9a38497a8807b7308961ede25b8e

hal/audio_extn/utils.c

diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index 7bf274e..1751a30 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -141,8 +141,6 @@
     snd_device = usecase->out_snd_device;
     pcm_device_id = platform_get_pcm_device_id(usecase->id, PCM_PLAYBACK);
 
-    snd_device = (snd_device == SND_DEVICE_OUT_SPEAKER) ?
-                 audio_extn_get_spkr_prot_snd_device(snd_device) : snd_device;
     acdb_dev_id = platform_get_snd_device_acdb_id(snd_device);
     if (acdb_dev_id < 0) {
         ALOGE("%s: Couldn't get the acdb dev id", __func__);
@@ -333,8 +331,7 @@
     struct stream_in *in;
 
     if (usecase->type == PCM_PLAYBACK) {
-        return platform_get_snd_device_acdb_id(
-                audio_extn_get_spkr_prot_snd_device(usecase->out_snd_device));
+        return platform_get_snd_device_acdb_id(usecase->out_snd_device);
     } else if(usecase->type == PCM_CAPTURE) {
         return platform_get_snd_device_acdb_id(usecase->in_snd_device);
     }