Merge "audio policy: fix regression in incall notification management" into mnc-dev (e59c6a33) · Commits · e / os / android_frameworks_av

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+5 −2

Original line number	Diff line number	Diff line
		@@ -427,7 +427,7 @@ void AudioPolicyManager::setPhoneState(audio_mode_t state)
		/// Opens: can these line be executed after the switch of volume curves???
		// if leaving call state, handle special case of active streams
		// pertaining to sonification strategy see handleIncallSonification()
		if (isInCall()) {
		if (isStateInCall(oldState)) {
		ALOGV("setPhoneState() in call state management: new state is %d", state);
		for (int stream = 0; stream < AUDIO_STREAM_CNT; stream++) {
		if (stream == AUDIO_STREAM_PATCH) {
		@@ -436,7 +436,7 @@ void AudioPolicyManager::setPhoneState(audio_mode_t state)
		handleIncallSonification((audio_stream_type_t)stream, false, true);
		}

		// force reevaluating accessibility routing when call starts
		// force reevaluating accessibility routing when call stops
		mpClientInterface->invalidateStream(AUDIO_STREAM_ACCESSIBILITY);
		}

		@@ -514,6 +514,9 @@ void AudioPolicyManager::setPhoneState(audio_mode_t state)
		}
		handleIncallSonification((audio_stream_type_t)stream, true, true);
		}

		// force reevaluating accessibility routing when call starts
		mpClientInterface->invalidateStream(AUDIO_STREAM_ACCESSIBILITY);
		}

		// Flag that ringtone volume must be limited to music volume until we exit MODE_RINGTONE