commit 7440d8c81e8e50a5e54bf6aed48ed8dfbad19255
author kevinshhsu <KevinSHHsu@fih-foxconn.com> Sun Jan 14 22:25:38 2018 +0800
committer David Lin <dtwlin@google.com> Thu Jan 18 17:45:32 2018 -0800
tree 9046fe524607ae7d94017a3dfa2264f9b47451fe
parent 46c68d35a7566dee0ea169998ffe9452043adc24

audio: enable speaker protection for speaker-safe

enable speaker protection for speaker-safe

Bug: 71526853
Change-Id: If47cf68fa2d7e273c6cbba031145b1a60c175607
Signed-off-by: kevinshhsu <KevinSHHsu@fih-foxconn.com>

hal/audio_extn/cirrus_playback.c

diff --git a/hal/audio_extn/cirrus_playback.c b/hal/audio_extn/cirrus_playback.c
index 1f7a9f7..30ba5e3 100644
--- a/hal/audio_extn/cirrus_playback.c
+++ b/hal/audio_extn/cirrus_playback.c
@@ -515,6 +515,9 @@
     case SND_DEVICE_OUT_SPEAKER:
         acdb_id = platform_get_snd_device_acdb_id(SND_DEVICE_OUT_SPEAKER_PROTECTED);
         break;
+    case SND_DEVICE_OUT_SPEAKER_SAFE:
+        acdb_id = platform_get_snd_device_acdb_id(SND_DEVICE_OUT_SPEAKER_SAFE);
+        break;
     case SND_DEVICE_OUT_VOICE_SPEAKER:
         acdb_id = platform_get_snd_device_acdb_id(SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED);
         break;
@@ -529,6 +532,8 @@
     switch(snd_device) {
     case SND_DEVICE_OUT_SPEAKER:
         return SND_DEVICE_OUT_SPEAKER_PROTECTED;
+    case SND_DEVICE_OUT_SPEAKER_SAFE:
+        return SND_DEVICE_OUT_SPEAKER_SAFE;
     case SND_DEVICE_OUT_VOICE_SPEAKER:
         return SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED;
     default:

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 47d7a0e..77081c7 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -629,6 +629,7 @@
     audio_extn_dsm_feedback_enable(adev, snd_device, true);
 
     if ((snd_device == SND_DEVICE_OUT_SPEAKER ||
+        snd_device == SND_DEVICE_OUT_SPEAKER_SAFE ||
         snd_device == SND_DEVICE_OUT_VOICE_SPEAKER) &&
         audio_extn_spkr_prot_is_enabled()) {
         if (audio_extn_spkr_prot_get_acdb_id(snd_device) < 0) {
@@ -683,6 +684,7 @@
     if (adev->snd_dev_ref_cnt[snd_device] == 0) {
         audio_extn_dsm_feedback_enable(adev, snd_device, false);
         if ((snd_device == SND_DEVICE_OUT_SPEAKER ||
+            snd_device == SND_DEVICE_OUT_SPEAKER_SAFE ||
             snd_device == SND_DEVICE_OUT_SPEAKER_REVERSE ||
             snd_device == SND_DEVICE_OUT_VOICE_SPEAKER) &&
             audio_extn_spkr_prot_is_enabled()) {