commit 7c378a5525a36bd5820a16f9dc12ff4b38aeeb6b
author Pavan Chikkala <pavanc@codeaurora.org> Fri Dec 04 15:39:24 2015 +0530
committer Prashant Malani <pmalani@google.com> Mon Mar 14 17:01:42 2016 -0700
tree dd5ef2c3c9e50aab8af27dc147dae7ba0f276a3a
parent 582e0a5e965897ea54ecfa5fe206797dab577a45

audiopolicy: Fixed build error

- Fixed Enforced Audible stream check for record-play
  concurrency use cases
- Added WEARABLE additional check to avoid errors for
  wearable PLs

Change-Id: I0ac4c496687ce3a5e7f30aef9ed099153e2cce4d

msm8909/hal/Android.mk

diff --git a/msm8909/hal/Android.mk b/msm8909/hal/Android.mk
index 7bb59ae..18d1f32 100644
--- a/msm8909/hal/Android.mk
+++ b/msm8909/hal/Android.mk
@@ -170,9 +170,11 @@
     LOCAL_SRC_FILES += audio_extn/dev_arbi.c
 endif
 
+ifneq ($(TARGET_SUPPORTS_WEARABLES),true)
 ifeq ($(strip $(AUDIO_FEATURE_ENABLED_RECORD_PLAY_CONCURRENCY)),true)
     LOCAL_CFLAGS += -DRECORD_PLAY_CONCURRENCY
 endif
+endif
 
 ifeq ($(strip $(AUDIO_FEATURE_ENABLED_ACDB_LICENSE)), true)
     LOCAL_CFLAGS += -DDOLBY_ACDB_LICENSE

msm8909/policy_hal/Android.mk

diff --git a/msm8909/policy_hal/Android.mk b/msm8909/policy_hal/Android.mk
index 29bb01a..fc9247a 100644
--- a/msm8909/policy_hal/Android.mk
+++ b/msm8909/policy_hal/Android.mk
@@ -27,13 +27,17 @@
 LOCAL_STATIC_LIBRARIES := \
     libmedia_helper \
 
+ifneq ($(TARGET_SUPPORTS_WEARABLES),true)
 ifeq ($(strip $(AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY)),true)
 LOCAL_CFLAGS += -DVOICE_CONCURRENCY
 endif
+endif
 
+ifneq ($(TARGET_SUPPORTS_WEARABLES),true)
 ifeq ($(strip $(AUDIO_FEATURE_ENABLED_RECORD_PLAY_CONCURRENCY)),true)
 LOCAL_CFLAGS += -DRECORD_PLAY_CONCURRENCY
 endif
+endif
 
 ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_FORMATS)),true)
 LOCAL_CFLAGS += -DAUDIO_EXTN_FORMATS_ENABLED

msm8909/policy_hal/AudioPolicyManager.cpp

diff --git a/msm8909/policy_hal/AudioPolicyManager.cpp b/msm8909/policy_hal/AudioPolicyManager.cpp
index a279c1e..0a73aa7 100644
--- a/msm8909/policy_hal/AudioPolicyManager.cpp
+++ b/msm8909/policy_hal/AudioPolicyManager.cpp
@@ -1839,7 +1839,7 @@
         // Move tracks associated to this strategy from previous output to new output
         for (int i = AUDIO_STREAM_SYSTEM; i < (int)AUDIO_STREAM_CNT; i++) {
             // Do not call invalidate for ENFORCED_AUDIBLE (otherwise pops are seen for camcorder)
-            if ((i != AUDIO_STREAM_ENFORCED_AUDIBLE && (i != AUDIO_STREAM_PATCH)) {
+            if ((i != AUDIO_STREAM_ENFORCED_AUDIBLE) && (i != AUDIO_STREAM_PATCH)) {
                ALOGD("Invalidate on releaseInput for stream :: %d ", i);
                //FIXME see fixme on name change
                mpClientInterface->invalidateStream((audio_stream_type_t)i);