Merge "audio policy: improve accessibility routing" into lmp-mr1-dev (0a0662ea) · Commits · e / os / android_frameworks_av

services/audiopolicy/AudioPolicyManager.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -596,6 +596,9 @@ void AudioPolicyManager::setPhoneState(audio_mode_t state)
		}
		handleIncallSonification((audio_stream_type_t)stream, false, true);
		}

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

		// store previous phone state for management of sonification strategy below
		@@ -1290,6 +1293,11 @@ status_t AudioPolicyManager::startOutput(audio_io_handle_t output,
		outputDesc->mPolicyMix->mRegistrationId);
		}

		// force reevaluating accessibility routing when ringtone or alarm starts
		if (strategy == STRATEGY_SONIFICATION) {
		mpClientInterface->invalidateStream(AUDIO_STREAM_ACCESSIBILITY);
		}

		if (waitMs > muteWaitMs) {
		usleep((waitMs - muteWaitMs) * 2 * 1000);
		}