Merge "Compilation fix: N-MR1 merge" into audio-userspace.lnx.2.2-dev (0c1c364f) · Commits · e / devices / Fairphone 4 / android_hardware_qcom_audio

policy_hal/AudioPolicyManager.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -520,7 +520,7 @@ bool AudioPolicyManagerCustom::isOffloadSupported(const audio_offload_info_t& of
		}

		if ((prop_rec_play_enabled) &&
		((true == mIsInputRequestOnProgress) \|\| (mInputs.activeInputsCount() > 0))) {
		((true == mIsInputRequestOnProgress) \|\| (mInputs.activeInputsCountOnDevices() > 0))) {
		ALOGD("copl: blocking compress offload for record concurrency");
		return false;
		}
		@@ -1661,7 +1661,7 @@ audio_io_handle_t AudioPolicyManagerCustom::getOutputForDevice(
		prop_rec_play_enabled = atoi(recConcPropValue) \|\| !strncmp("true", recConcPropValue, 4);
		}
		if ((prop_rec_play_enabled) &&
		((true == mIsInputRequestOnProgress) \|\| (mInputs.activeInputsCount() > 0))) {
		((true == mIsInputRequestOnProgress) \|\| (mInputs.activeInputsCountOnDevices() > 0))) {
		if (AUDIO_MODE_IN_COMMUNICATION == mEngine->getPhoneState()) {
		if (AUDIO_OUTPUT_FLAG_VOIP_RX & flags) {
		// allow VoIP using voice path
		@@ -2098,7 +2098,7 @@ status_t AudioPolicyManagerCustom::startInput(audio_io_handle_t input,
		prop_rec_play_enabled = atoi(getPropValue) \|\| !strncmp("true", getPropValue, 4);
		}

		if ((prop_rec_play_enabled) &&(mInputs.activeInputsCount() == 0)){
		if ((prop_rec_play_enabled) &&(mInputs.activeInputsCountOnDevices() == 0)){
		// send update to HAL on record playback concurrency
		AudioParameter param = AudioParameter();
		param.add(String8("rec_play_conc_on"), String8("true"));
		@@ -2144,7 +2144,7 @@ status_t AudioPolicyManagerCustom::startInput(audio_io_handle_t input,
		MIX_STATE_MIXING);
		}

		if (mInputs.activeInputsCount() == 0) {
		if (mInputs.activeInputsCountOnDevices() == 0) {
		SoundTrigger::setCaptureState(true);
		}
		setInputDevice(input, getNewInputDevice(input), true /* force */);
		@@ -2189,7 +2189,7 @@ status_t AudioPolicyManagerCustom::stopInput(audio_io_handle_t input,
		prop_rec_play_enabled = atoi(propValue) \|\| !strncmp("true", propValue, 4);
		}

		if ((prop_rec_play_enabled) && (mInputs.activeInputsCount() == 0)) {
		if ((prop_rec_play_enabled) && (mInputs.activeInputsCountOnDevices() == 0)) {

		//send update to HAL on record playback concurrency
		AudioParameter param = AudioParameter();