commit 5171705a38e73290c2b14b7ed778917ea29add15
author qctecmdr <qctecmdr@localhost> Mon Oct 28 21:43:36 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Oct 28 21:43:36 2019 -0700
tree 7c2dfe53dec6c0b2dfa6c40c5b1e0f205176f201
parent 0e1c608b08ad35ba1a534f1246c4f61b69d7acef
parent e3af510239245fa70bfba1964b99f9f0a1b3686f

Merge "hal: Fix ADM sampling rate for native playback."

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 5bbd595..38e57a8 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2743,6 +2743,8 @@
                     usecase->stream.out->sample_rate,
                     &usecase->stream.out->app_type_cfg.sample_rate);
         } else if (((out_snd_device != SND_DEVICE_OUT_HEADPHONES_44_1 &&
+                     out_snd_device != SND_DEVICE_OUT_HEADPHONES &&
+                     out_snd_device != SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER &&
                      !audio_is_true_native_stream_active(adev)) &&
                     usecase->stream.out->sample_rate == OUTPUT_SAMPLING_RATE_44100) ||
                     (usecase->stream.out->sample_rate < OUTPUT_SAMPLING_RATE_44100)) {