Merge commit 'cda6ed314ac73ffaeb0350056c84fc0d8b7b58ea' into eclair-mr2
* commit 'cda6ed314ac73ffaeb0350056c84fc0d8b7b58ea':
Fix issue 2304701: Media streams can remain muted on A2DP output.
The problem comes from the fact that when a notification is played on both headsets + speaker,
the media strategy is muted. It is only unmuted when a new device is selected on hardwate output
(for instance headset only when music starts).
If an A2DP output is created while music is muted, AudioFlinger with use the last value received
for music volume to initialize the music stream volume on the newly created A2DP output, which in
this case is 0. The code in audio policy manager that applies stream volumes after the A2DP output
has been created is inefficient here, because as music stream is muted, the request to change the
volume is ignored.
As next time music starts it is now played over A2DP output and not on HW output,
no device modification is done on HW output and the music streams remains muted.
This is also applicatble to SYSTEM and TTS streams.
The fix consists in keeping a stream mute count on each output separately instead of a global stream mute count.
Thus when the music volume is re applied after A2DP output creation, the request is not ignored as the music stream is not
muted on A2DP output.
Merge commit '49a5c99a84626b5b1db4eda5239307e3366e28fa' into eclair-mr2
* commit '49a5c99a84626b5b1db4eda5239307e3366e28fa':
libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
The GPU now correctly maps everything throug hthe MMU so physical addresses
are no longer needed.
Change-Id: Id16a690f63d7141c8ee6694b246b1955f450b8ed
Signed-off-by: Dima Zavin <dima@android.com>
Merge commit 'fea8b9e5641e1bdf8498b39cf108971c6fd130f8' into eclair-mr2
* commit 'fea8b9e5641e1bdf8498b39cf108971c6fd130f8':
Patch from HTC: changes in libaudio
Merge commit '0a6561450eddb6b13f56392fb116d6ed2ef3694f' into eclair-mr2
* commit '0a6561450eddb6b13f56392fb116d6ed2ef3694f':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
* changes:
Patch from HTC: changes in libaudio - remove redundant ACDB updates for audio playback and recording. - remove redundant ACDB updates for audio route changes during playback or recording. Along with the matching audio driver change, this fixes b/2275992 and click before playback and AudioHardware is going to standby.
- remove redundant ACDB updates for audio playback and recording.
- remove redundant ACDB updates for audio route changes during playback or recording.
Along with the matching audio driver change, this fixes b/2275992
and click before playback and AudioHardware is going to standby.
Merge commit 'bd94d9af5cc7067b0e849af076183626b4c32e4e' into eclair-mr2
* commit 'bd94d9af5cc7067b0e849af076183626b4c32e4e':
part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
Merge commit '8a5a107a014f94e6335b88f1942c82d23ceb6b04' into eclair-mr2
* commit '8a5a107a014f94e6335b88f1942c82d23ceb6b04':
Improvement for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes.
Merge commit '58cf88a5a91d82ae2fb3e23365eaa4524a9cd089' into eclair-mr2
* commit '58cf88a5a91d82ae2fb3e23365eaa4524a9cd089':
Patch from HTC related to use of camcorder with wired headset plugged in:
- libaudio: incorrect ACDB setting was used when starting to record
with wired headset.
- libaudio: remove unnecessary audio path switch when camcorder is started
with wired headset.
Submitted on behalf of HK Chen <hk_chen@htc.com>
Merge commit '979de023050ebe82680c665259fc833b0a17d3f5' into eclair-mr2
* commit '979de023050ebe82680c665259fc833b0a17d3f5':
Fix issue 2245963: incoming call rings in ringtone-volume level through a wired headset is while listening to music.
to fix issue 2229040. This workaround is considered no longer useful
by HTC since the changes in the A1026 configuration.
Removing workaround on behalf of HK Chen (HTC).
When the ringtone is not looped (non factory ringtone), a new AudioTrack is started every time the ringtone is repeated. The second time the track is started, the condition that triggers volume limitation is not true any more as music has been stopped for more than SONIFICATION_HEADSET_MUSIC_DELAY seconds and ringtone volume is not limited.
The fix consists in checking the condition (music playing or stopped for less than SONIFICATION_HEADSET_MUSIC_DELAY) when entering ringtone mode and latch it until we exit ringtone mode.
Merge commit '072b5f0df424b2a0c50cdb7b605d3a749dcac7cf' into eclair-mr2
* commit '072b5f0df424b2a0c50cdb7b605d3a749dcac7cf':
should help [2223746] qsd8k MDP locks up, logs show copyBits failed (Connection timed out) in Passion camera zoom level 1
Merge commit '956f7ba5ee0f087c91b5fefd2718dae30f8c1e29' into eclair-mr2
* commit '956f7ba5ee0f087c91b5fefd2718dae30f8c1e29':
Workaround for issue 2229040: [Passion] Audio driver stuck when changing input routing while recording is active.
This change avoids the audio driver lockup when changing audio input path configuration. It does not solve the root cause in audio driver or dsp.
When applied lockups observed in the folling use cases are eliminated:
- use back mic for camcorder recording (issue 2194140)
- switch input device when headset is plugged in or out during record (issue 2226658).
Also removes warnings.
Submitted on behalf of H.K Chen <hk_chen@htc.com>
Merge commit 'f06a9889288034e9bd3e54fbae3bb48ad7bd3f89' into eclair-mr2
* commit 'f06a9889288034e9bd3e54fbae3bb48ad7bd3f89':
Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.
Merge commit 'b7f7f038529135a5c21234ae89e4b87a1c56854a' into eclair-mr2
* commit 'b7f7f038529135a5c21234ae89e4b87a1c56854a':
enable mdp debugging on error, also check for invalid inputs
Merge commit 'ba36d4fa33072ef14183365fffd289762c26905e' into eclair-mr2
* commit 'ba36d4fa33072ef14183365fffd289762c26905e':
When configuring the A10026 for microphone input outside of a call,
Merge commit '63af0f3cbd387e97bcaca82d1e22787c224d6430' into eclair-mr2
* commit '63af0f3cbd387e97bcaca82d1e22787c224d6430':
Use new acoustic parameters when recording in voice recognition mode
-- new a1026.h kernel header that contains just the user-space API and is
sanitized through bionic/libc/kernel/tools/clean_header.py
-- AudioHardware.cpp:
-- replace vr_mode with vr_mode_enabled, and use 0 and 1 instead of
A1026_VR_MODE_DISABLED/ENABLED, which is not defined in the kernel
header;
-- in doA1026_init(), replace a fread() of 1 byte with a read that as
much as possible from the firmware file in as few as possible passes
before we call into the kernel
-- Replace the size of the on-stack f/w buffer with A1026_MAX_FW_SIZE,
which now comes from the kernel header
-- Fix up some signed-unsigned comparison warnings on mBluetoothIdTx
Signed-off-by: Iliyan Malchev <malchev@google.com>
Modified AudioPolicyManager::setDeviceConnectionState() so that the device on active audio input is updated when a device is connected or disconnected.
The wrong key was used when removing the voice recognition mode from parameters list after handling it in AudioStreamInMSM72xx::setParameters() causing the set routing parameter to be removed and ignored.
Merge commit 'dbef679fccd8d44881642564c54baafa41da6c55' into eclair-mr2
* commit 'dbef679fccd8d44881642564c54baafa41da6c55':
Update lights to support the change in parameters passed by the framework
Merge commit '4bcd5b16c66bc5c2bffe232f15f5cb83aea18318' into eclair-mr2
* commit '4bcd5b16c66bc5c2bffe232f15f5cb83aea18318':
Use new A1026 header to us 1026 presets that match the driver.
Merge commit '739de5f36523862a7caa15590bd6b680b6cd2854' into eclair-mr2
* commit '739de5f36523862a7caa15590bd6b680b6cd2854':
Fix bug 2194140 Add support for the voice recognition mode.
