Merge commit '467b99831bbcfdb42edf7794409095ee8bc84c71' into eclair-mr2-plus-aosp
* commit '467b99831bbcfdb42edf7794409095ee8bc84c71':
Fix bug 2210203 where Music volume is reduced after reducing in-call volume.
Merge commit 'e26fd7576c0c0963ac7e11c249db8f56a8c08a92' into eclair-mr2
* commit 'e26fd7576c0c0963ac7e11c249db8f56a8c08a92':
Fix bug 2210203 where Music volume is reduced after reducing in-call volume.
This is the combination of two issues:
- on QSD8K, the voice volume affects all streams, even when not in call.
This is fixed by setting the voice volume to unity gain whenever
exiting a call.
- another related issue was that when entering a call with no audio
playing, the in-call volume would be at its max. This is due to
the audio driver resetting the gain to unity when creating a new
output. AudioPolicyManager::setPhoneState() would sometimes fail
to force the reset of the audio volumes when entering a call, causing
the driver to use the unity gain, not the in-call volume set by the
user. This is fixed by testing whether is call is starting or ending
independently from the logic to determine the new ouput device.
Merge commit '88316f709083652c4aa9eca6f64631c0ec77fb07' into eclair-mr2-plus-aosp
* commit '88316f709083652c4aa9eca6f64631c0ec77fb07':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit '0bf3ac2c797fc9e1a327f867d69bbb0b54a68ffa' into eclair-mr2
* commit '0bf3ac2c797fc9e1a327f867d69bbb0b54a68ffa':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Applications are supposed to hold a wakelock. However, since 1.0,
the audio driver and/or HAL has held a partial wakelock. That means
that many apps will be broken if we don't hold a wakelock while
audio is playing. This patch holds a wakelock while the audio
driver is open and releases it when it goes to standby mode.
Bluetooth A2DP suspend-resume improvements.
This change will reduce the occurence rate of A2DP sink suspend resume failures observed in issues 2184627, 2181005 and possibly 2189628.
Suspend A2DP output when phone state is not NORMAL and not only when it is RINGTONE.
Update A2DP suspend state when an A2DP or SCO device is connected or disconnected while phone state is not NORMAL.
Merge commit 'a8eaa9a397383b776b5b65dc479502e70d567dcf' into eclair-mr2-plus-aosp
* commit 'a8eaa9a397383b776b5b65dc479502e70d567dcf':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Merge commit '7eda9410e218b2f2ff3f776897fbc1b679b6132d' into eclair-mr2
* commit '7eda9410e218b2f2ff3f776897fbc1b679b6132d':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Modified checkAndSetVolume() method to adjust VOICE_CALL, BLUETOOTH_SCO and DTMF stream volumes to match audio hardware behavior (never 0).
Also do the following adjustments on stream volumes:
- VOICE_CALL:
if in call, force software volume to max to avoid applying the volume twice (software mixer + audio hardware)
send setVoiceVolume() to set in call volume in audio hardware
- BLUETOOTH_SCO:
send setVoiceVolume() with max value because volume is applied by BT headset and should not be also applied by audio hardware.
- DTMF:
if in call and not using the BT SCO device, force software volume to max to avoid applying the volume twice (software mixer + audio hardware)
This change will reduce the occurence rate of A2DP sink suspend resume failures observed in issues 2184627, 2181005 and possibly 2189628.
Suspend A2DP output when phone state is not NORMAL and not only when it is RINGTONE.
Update A2DP suspend state when an A2DP or SCO device is connected or disconnected while phone state is not NORMAL.
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 '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 '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.
