Merge commit 'ba8101e944ec0ffea2b89739667d3ce731d6e818'
* commit 'ba8101e944ec0ffea2b89739667d3ce731d6e818':
Fix issue 2172934: AudioHardware for msm7k: some file descriptor tests must be fixed.
Merge commit 'ba8101e944ec0ffea2b89739667d3ce731d6e818' into eclair-plus-aosp
* commit 'ba8101e944ec0ffea2b89739667d3ce731d6e818':
Fix issue 2172934: AudioHardware for msm7k: some file descriptor tests must be fixed.
The fix consists in adding a parameter to handleIncallSonification() indicating that it is called from setPhoneState() in which case the stream mute or unmute is called as many times as there are active tracks on the output.
Also change the time when handleIncallSonification() is called in setPhoneState() to make sure that both mPhoneSate and the selected device are coherent with the IN_CALL state when the fucntion is called.
* changes:
Fix bug 2146274. Modify the Audio Policy Manager to support dynamic rerouting of STREAM_VOICE_CALL streams when using AudioManager.setSpeakerphoneOn(bool) even when not in call.
to support dynamic rerouting of STREAM_VOICE_CALL streams when using
AudioManager.setSpeakerphoneOn(bool) even when not in call.
The setSpeakerphoneOn() method is mapped in the AudioPolicyManager to
a call to setForceUse for the AudioSystem::FOR_COMMUNICATION usage.
This was only updating the output device when the current mode
was MODE_IN_CALL. The change consists in changing the routing
also when there is an active stream of type AudioSystem::VOICE_CALL
as we allow that stream type to be used not just for telephony streams,
but for communications in general.
The kernel will only do it for images with an alpha plane.
Change-Id: Idcba41945ed7d17daae0a5bcc48c64a82a49dded
Signed-off-by: Dima Zavin <dima@android.com>
Merge commit 'c96a375c6ad3551f1294a5c9b293c464a9b90d76'
* commit 'c96a375c6ad3551f1294a5c9b293c464a9b90d76':
Fix issue 2118500: Ringer volume control broken after a call is terminated while a ring tone is playing and a BT headset is connected.
Merge commit 'dc4d5ad6482f97e33366f32ad2afd2a304810fb7' into eclair-plus-aosp
* commit 'dc4d5ad6482f97e33366f32ad2afd2a304810fb7':
Fix issue 2118500: Ringer volume control broken after a call is terminated while a ring tone is playing and a BT headset is connected.
There was a problem in the special management of notifications while incall when using a duplicated output (with A2DP headset connected). When in call, the notifications are not played on both A2DP + speaker outputs but replaced by a tone in the device used for in call audio. When the call ends while a notification or ring tone is playing, the notification was not moved back to duplicated output (A2DP+speaker).
We must also make sure that the code that unmutes notification playback and stops the tone is called before the notification stream is moved back to duplicated output as it handles the volume and routing on hardware output only.
Also fixed a potential problem in active tracks counting when moving DTMF stream from A2DP output to hardware output when changing cal
l state.
Merge commit '91205c41286a28a9714e8147e6a996e5dd56cd9a'
* commit '91205c41286a28a9714e8147e6a996e5dd56cd9a':
Fix issue 2100324: Limit ringtone and notifications volume when a headset is connected.
Merge commit '56357dc98d4b886dcaa7218fe9286eae8bb6b8ad' into eclair-plus-aosp
* commit '56357dc98d4b886dcaa7218fe9286eae8bb6b8ad':
Fix issue 2100324: Limit ringtone and notifications volume when a headset is connected.
Merge commit 'c9410082453abfb6eaaf43e6c97e04711d0751c0' into eclair-plus-aosp
* commit 'c9410082453abfb6eaaf43e6c97e04711d0751c0':
libcopybit: Fix typo, and the build
Apply the following rules to ring tones and notifications to avoid sound level bursts in user's ears:
- always attenuate ring tones and notifications volume by 6dB
- if music is playing, always limit the volume to current music volume, with a minimum threshold at -36dB so that notification is always perceived.
Merge commit '67bfa63fae1e80d8aedd966c6f0a0e823c93f0b1'
* commit '67bfa63fae1e80d8aedd966c6f0a0e823c93f0b1':
liblights: fix LED transitions when an amber LED is supported
