commit 2b3e0735da574c1fcc9b6808e254beedebbf8145
author Linux Build Service Account <lnxbuild@quicinc.com> Thu Jun 08 13:15:48 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jun 08 13:15:48 2017 -0700
tree c14ed258b393cf9667615c79e552de1fa38c79b4
parent 254eade1d800ba4be386b9e6c73cc070fd88e749
parent 328530af761a772ee4d3577efa8cb4e7504e17a0

Merge "qahw: test: Add support for dual main decoding"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index a04cc45..c8b1cae 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -4652,7 +4652,10 @@
             if ((usecase->type == PCM_PLAYBACK) &&
                 (usecase->devices & AUDIO_DEVICE_OUT_ALL_A2DP)){
                 ALOGD("reconfigure a2dp... forcing device switch");
+
+                pthread_mutex_unlock(&adev->lock);
                 lock_output_stream(usecase->stream.out);
+                pthread_mutex_lock(&adev->lock);
                 audio_extn_a2dp_set_handoff_mode(true);
                 //force device switch to re configure encoder
                 select_devices(adev, usecase->id);

visualizer/Android.mk

diff --git a/visualizer/Android.mk b/visualizer/Android.mk
index 622af33..aa780a1 100644
--- a/visualizer/Android.mk
+++ b/visualizer/Android.mk
@@ -21,7 +21,7 @@
 
 LOCAL_CFLAGS+= -O2 -fvisibility=hidden
 
-ifneq ($(filter sdm660 msm8998,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter sdm660 sdm845 msm8998,$(TARGET_BOARD_PLATFORM)),)
     LOCAL_CFLAGS += -DCAPTURE_DEVICE=7
 endif