commit 51d8c2a223c281389450accd1ec7cc322c908abe
author Meng Wang <mengw@codeaurora.org> Mon Apr 27 15:23:21 2020 +0800
committer Meng Wang <mengw@codeaurora.org> Tue May 12 16:43:45 2020 +0800
tree 2cfddb3dc6bff0c5f966551796772a1637b64d81
parent ae1f96a97e5e30e7a090fb659620ec305e741791

hal: update haptics PCM ID

Update haptics PCM ID according to the pcm id set in
audio_platform_info.xml.

Change-Id: Ib6a208449a16f595a0ef9d1a4281aa8e96e088c2

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 7e08c5c..82a5d92 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -328,6 +328,7 @@
     [USECASE_AUDIO_PLAYBACK_DEEP_BUFFER] = "deep-buffer-playback",
     [USECASE_AUDIO_PLAYBACK_LOW_LATENCY] = "low-latency-playback",
     [USECASE_AUDIO_PLAYBACK_WITH_HAPTICS] = "audio-with-haptics-playback",
+    [USECASE_AUDIO_PLAYBACK_HAPTICS] = "haptics-playback",
     [USECASE_AUDIO_PLAYBACK_ULL]         = "audio-ull-playback",
     [USECASE_AUDIO_PLAYBACK_MULTI_CH]    = "multi-channel-playback",
     [USECASE_AUDIO_PLAYBACK_OFFLOAD] = "compress-offload-playback",
@@ -3780,7 +3781,8 @@
     }
 
     if (is_haptic_usecase) {
-        adev->haptic_pcm_device_id = platform_get_haptics_pcm_device_id();
+        adev->haptic_pcm_device_id = platform_get_pcm_device_id(
+                     USECASE_AUDIO_PLAYBACK_HAPTICS, PCM_PLAYBACK);
         if (adev->haptic_pcm_device_id < 0) {
             ALOGE("%s: Invalid Haptics pcm device id(%d) for the usecase(%d)",
                   __func__, adev->haptic_pcm_device_id, out->usecase);