Merge commit '0fd7c5be0e7e7f1013617ed2da24941c596a2137' into eclair-mr2-plus-aosp
* commit '0fd7c5be0e7e7f1013617ed2da24941c596a2137':
Patch from HTC related to use of camcorder with wired headset plugged in:
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 '0a210585758e1b3ede232b9dddb1494a55dc157a' into eclair-mr2-plus-aosp
* commit '0a210585758e1b3ede232b9dddb1494a55dc157a':
Fix issue 2245963: incoming call rings in ringtone-volume level through a wired headset is while listening to music.
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 'bcd5273d6aa77cc961261202c8c9eee950ddc8b7' into eclair-mr2-plus-aosp
* commit 'bcd5273d6aa77cc961261202c8c9eee950ddc8b7':
should help [2223746] qsd8k MDP locks up, logs show copyBits failed (Connection timed out) in Passion camera zoom level 1
Merge commit 'd285af5636ac54b37da3b4048b17855ac9c32a42' into eclair-mr2-plus-aosp
* commit 'd285af5636ac54b37da3b4048b17855ac9c32a42':
Workaround for issue 2229040: [Passion] Audio driver stuck when changing input routing while recording is active.
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.
Merge commit '072b5f0df424b2a0c50cdb7b605d3a749dcac7cf' into eclair-plus-aosp
* 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-plus-aosp
* 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 '5fd5d902775cbdb0e9498c6708b99316de8e3e17' into eclair-mr2-plus-aosp
* commit '5fd5d902775cbdb0e9498c6708b99316de8e3e17':
Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.
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 'f06a9889288034e9bd3e54fbae3bb48ad7bd3f89' into eclair-plus-aosp
* commit 'f06a9889288034e9bd3e54fbae3bb48ad7bd3f89':
Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.
Merge commit '977729303ce0a5609b3ddbd36e6801d8397ff5c4' into eclair-mr2-plus-aosp
* commit '977729303ce0a5609b3ddbd36e6801d8397ff5c4':
enable mdp debugging on error, also check for invalid inputs
Merge commit 'b7f7f038529135a5c21234ae89e4b87a1c56854a' into eclair-mr2
* commit 'b7f7f038529135a5c21234ae89e4b87a1c56854a':
enable mdp debugging on error, also check for invalid inputs
Merge commit 'b7f7f038529135a5c21234ae89e4b87a1c56854a' into eclair-plus-aosp
* commit 'b7f7f038529135a5c21234ae89e4b87a1c56854a':
enable mdp debugging on error, also check for invalid inputs
Merge commit '8d4f9726fcf28989a8e6d6cce6b1ef8fa464a160' into eclair-mr2-plus-aosp
* commit '8d4f9726fcf28989a8e6d6cce6b1ef8fa464a160':
When configuring the A10026 for microphone input outside of a call,
Merge commit '9bf3ce7d445eb3fc4043bc59d6c1adc16f3f8f32' into eclair-mr2-plus-aosp
* commit '9bf3ce7d445eb3fc4043bc59d6c1adc16f3f8f32':
Use new acoustic parameters when recording in voice recognition mode
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.
Merge commit 'ba36d4fa33072ef14183365fffd289762c26905e' into eclair-plus-aosp
* commit 'ba36d4fa33072ef14183365fffd289762c26905e':
When configuring the A10026 for microphone input outside of a call,
Merge commit '63af0f3cbd387e97bcaca82d1e22787c224d6430' into eclair-plus-aosp
* commit '63af0f3cbd387e97bcaca82d1e22787c224d6430':
Use new acoustic parameters when recording in voice recognition mode
