Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 515e4815 authored Dec 04, 2015 by Pavan Chikkala

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

parent 410c530a

hal/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -172,9 +172,11 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DEV_ARBI)),true)
		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

policy_hal/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -27,13 +27,17 @@ LOCAL_SHARED_LIBRARIES := \
		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

policy_hal/AudioPolicyManager.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1778,7 +1778,7 @@ status_t AudioPolicyManagerCustom::startInput(audio_io_handle_t input,
		// 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);