Commit Graph

336 Commits

Author SHA1 Message Date
Eric Laurent
6cc87a5335 am d07a9442: am 69739a19: am 63e2c0ab: Log for issue 2203561.
Merge commit 'd07a94426aa9a6341bf1744d7b97afe5330448a1'

* commit 'd07a94426aa9a6341bf1744d7b97afe5330448a1':
  Log for issue 2203561.
2009-11-03 10:48:43 -08:00
Eric Laurent
f3b8e0062c am 69739a19: am 63e2c0ab: Log for issue 2203561.
Merge commit '69739a19dae87bfa81b7fda1504da58067485296' into eclair-mr2-plus-aosp

* commit '69739a19dae87bfa81b7fda1504da58067485296':
  Log for issue 2203561.
2009-11-03 10:43:39 -08:00
Eric Laurent
e16492bb26 am 63e2c0ab: Log for issue 2203561.
Merge commit '63e2c0ab3b3cfac68ed3832adfbf4e5a0b32ed8f' into eclair-mr2

* commit '63e2c0ab3b3cfac68ed3832adfbf4e5a0b32ed8f':
  Log for issue 2203561.
2009-11-03 10:33:07 -08:00
Eric Laurent
3262f5a8b3 Log for issue 2203561.
Added detailed dump for AudioPolicyManager when AudioPolicyService is dumped.
2009-11-03 09:18:39 -08:00
Jean-Michel Trivi
39019b2e6d am 8cc29e78: am 0199fcd0: am 10254cc3: HTC update: add attenuation to avoid distortion, and compensate in acoustic parameters.
Merge commit '8cc29e785722bc73b9c27fc6e3369aa777c879a8'

* commit '8cc29e785722bc73b9c27fc6e3369aa777c879a8':
  HTC update: add attenuation to avoid distortion, and compensate in
2009-11-02 19:18:21 -08:00
Jean-Michel Trivi
9a32bfa068 am 0199fcd0: am 10254cc3: HTC update: add attenuation to avoid distortion, and compensate in acoustic parameters.
Merge commit '0199fcd0fc04be3361b8843110594b87a0dfc4a9' into eclair-mr2-plus-aosp

* commit '0199fcd0fc04be3361b8843110594b87a0dfc4a9':
  HTC update: add attenuation to avoid distortion, and compensate in
2009-11-02 19:13:06 -08:00
Jean-Michel Trivi
4baa9f4a8a am 10254cc3: HTC update: add attenuation to avoid distortion, and compensate in acoustic parameters.
Merge commit '10254cc35f5cb7ebe2c7ef452815486cb8e92a33' into eclair-mr2

* commit '10254cc35f5cb7ebe2c7ef452815486cb8e92a33':
  HTC update: add attenuation to avoid distortion, and compensate in
2009-11-02 19:08:07 -08:00
Jean-Michel Trivi
541bf8c3ad HTC update: add attenuation to avoid distortion, and compensate in
acoustic parameters.
2009-11-02 15:01:45 -08:00
Eric Laurent
6e111f0fcc am bd4731ab: am 37b1a748: am da9d5ab1: Fix issue 2194140: [Passion] Support Audience chip.
Merge commit 'bd4731ab2a9dda560e454f6981c05dcb9991141e'

* commit 'bd4731ab2a9dda560e454f6981c05dcb9991141e':
  Fix issue 2194140: [Passion] Support Audience chip.
2009-11-02 12:57:52 -08:00
Eric Laurent
9107a70dbf am 37b1a748: am da9d5ab1: Fix issue 2194140: [Passion] Support Audience chip.
Merge commit '37b1a7483c2f5e27e662272aef6686ef7f718045' into eclair-mr2-plus-aosp

* commit '37b1a7483c2f5e27e662272aef6686ef7f718045':
  Fix issue 2194140: [Passion] Support Audience chip.
2009-11-02 12:51:11 -08:00
Eric Laurent
bec52c4fb9 am da9d5ab1: Fix issue 2194140: [Passion] Support Audience chip.
Merge commit 'da9d5ab10524c32d7949363a10fde1bec5fdf9fa' into eclair-mr2

* commit 'da9d5ab10524c32d7949363a10fde1bec5fdf9fa':
  Fix issue 2194140: [Passion] Support Audience chip.
2009-11-02 12:40:40 -08:00
Eric Laurent
8ee0bbf7dd am 72b357c4: am c5ae55eb: am 0f2f4d0a: Fix issue 2194140, Part 1.
Merge commit '72b357c4eb1f99c01b38e5cdb1afa52b339648a8'

* commit '72b357c4eb1f99c01b38e5cdb1afa52b339648a8':
  Fix issue 2194140, Part 1.
2009-11-02 10:42:21 -08:00
Eric Laurent
0d43af11b7 am c5ae55eb: am 0f2f4d0a: Fix issue 2194140, Part 1.
Merge commit 'c5ae55eb3fa91197a860bb554151dd5f311145c4' into eclair-mr2-plus-aosp

* commit 'c5ae55eb3fa91197a860bb554151dd5f311145c4':
  Fix issue 2194140, Part 1.
2009-11-02 10:36:22 -08:00
Eric Laurent
0b6e4f3537 am 0f2f4d0a: Fix issue 2194140, Part 1.
Merge commit '0f2f4d0a60cf93a7a281e217408a4249715f5748' into eclair-mr2

* commit '0f2f4d0a60cf93a7a281e217408a4249715f5748':
  Fix issue 2194140, Part 1.
2009-11-02 10:31:53 -08:00
Eric Laurent
d861f3a7a3 Fix issue 2194140: [Passion] Support Audience chip.
AudioHardware QSD8k:
- Add setParameters comment to control noise suppression states via new IOCTL A1026_SET_NS_STATE implemented in a1026 driver.
- Add support for new input device DEVICE_IN_BACK_MIC.
AudioPolicyManager:
- Add support for audio source AUDIO_SOURCE_CAMCORDER.
2009-11-02 05:26:06 -08:00
Mathias Agopian
7fbe8c04e4 am e3c65ac1: am f4a09d74: am 87ea1dfa: fix[2222341] Soft reset while going back from camcorder settings
Merge commit 'e3c65ac1403b0221c69b4f1c5023b781a5ca4cad'

* commit 'e3c65ac1403b0221c69b4f1c5023b781a5ca4cad':
  fix[2222341] Soft reset while going back from camcorder settings
2009-11-01 21:55:12 -08:00
Eric Laurent
6bb9f88291 Fix issue 2194140, Part 1.
Submitted on behalf of HK Chen <hk_chen@htc.com>

1) implement ACDB dynamic update for 1) audio playback, 2) audio recording, 3) BT headsets.
2) implement A1026 hard reset recovery mechanism
2009-10-31 00:51:56 -07:00
Mathias Agopian
0b88fd2ee3 am f4a09d74: am 87ea1dfa: fix[2222341] Soft reset while going back from camcorder settings
Merge commit 'f4a09d7449ffd2480d2d3d9fcc6744d4b8dcaa66' into eclair-mr2-plus-aosp

* commit 'f4a09d7449ffd2480d2d3d9fcc6744d4b8dcaa66':
  fix[2222341] Soft reset while going back from camcorder settings
2009-10-30 15:10:26 -07:00
Mathias Agopian
3e756c25d5 am 87ea1dfa: fix[2222341] Soft reset while going back from camcorder settings
Merge commit '87ea1dfa60cf130fafdbab8e94cb2ce9ff8d0975' into eclair-mr2

* commit '87ea1dfa60cf130fafdbab8e94cb2ce9ff8d0975':
  fix[2222341] Soft reset while going back from camcorder settings
2009-10-30 15:02:10 -07:00
Mathias Agopian
b73f40535f fix[2222341] Soft reset while going back from camcorder settings
add a way to convert a mapped "pushbuffer" buffer to a gralloc handle
which then can be safely used by surfaceflinger

also make sure to not send empty rectangles to the MDP.
2009-10-30 14:52:52 -07:00
Patrick Scott
fd2e048d2c am d9b1ab0b: am 7930a644: Merge change I5d43ba27 into eclair-mr2
Merge commit 'd9b1ab0b564fea713db053d3acbf98f5e4506276'

* commit 'd9b1ab0b564fea713db053d3acbf98f5e4506276':
  Remove calls to dump_l.
2009-10-30 05:35:49 -07:00
Patrick Scott
cb53be231e am 7930a644: Merge change I5d43ba27 into eclair-mr2
Merge commit '7930a644d5accac458193650ba5e1241299d048d' into eclair-mr2-plus-aosp

* commit '7930a644d5accac458193650ba5e1241299d048d':
  Remove calls to dump_l.
2009-10-30 05:30:30 -07:00
Android (Google) Code Review
d79323d3f0 Merge change I5d43ba27 into eclair-mr2
* changes:
  Remove calls to dump_l.
2009-10-30 08:23:03 -04:00
Jean-Michel Trivi
0672624153 am ba1d8944: am 467b9983: am e26fd757: 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 volu
Merge commit 'ba1d894484e8063378df9957163858cdc8d3e1d6'

* commit 'ba1d894484e8063378df9957163858cdc8d3e1d6':
  Fix bug 2210203 where Music volume is reduced after reducing in-call volume.
2009-10-29 20:20:59 -07:00
Jean-Michel Trivi
9fccf28bc0 am 467b9983: am e26fd757: 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 g
Merge commit '467b99831bbcfdb42edf7794409095ee8bc84c71' into eclair-mr2-plus-aosp

* commit '467b99831bbcfdb42edf7794409095ee8bc84c71':
  Fix bug 2210203 where Music volume is reduced after reducing in-call volume.
2009-10-29 20:00:46 -07:00
Jean-Michel Trivi
b9352d71f8 am e26fd757: 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
Merge commit 'e26fd7576c0c0963ac7e11c249db8f56a8c08a92' into eclair-mr2

* commit 'e26fd7576c0c0963ac7e11c249db8f56a8c08a92':
  Fix bug 2210203 where Music volume is reduced after reducing in-call volume.
2009-10-29 19:27:55 -07:00
Patrick Scott
4705b7db85 Remove calls to dump_l.
This fails to compile without NDEBUG and the log statement is accomplishing the
same thing.
2009-10-29 08:35:22 -04:00
Dave Sparks
f712780670 am 83548d1f: am 6eb47e20: am 5d89308f: Add wakelock to audio HAL. Bug 2218158.
Merge commit '83548d1f5bc2591d64dccbf199fd57835188f1ef'

* commit '83548d1f5bc2591d64dccbf199fd57835188f1ef':
  Add wakelock to audio HAL. Bug 2218158.
2009-10-29 01:56:18 -07:00
Dave Sparks
05d8b7709c am 6eb47e20: am 5d89308f: Add wakelock to audio HAL. Bug 2218158.
Merge commit '6eb47e20d76678b265a9d8e7dd0cf2fe4fbf6253' into eclair-mr2-plus-aosp

* commit '6eb47e20d76678b265a9d8e7dd0cf2fe4fbf6253':
  Add wakelock to audio HAL. Bug 2218158.
2009-10-29 01:47:45 -07:00
Dave Sparks
7755f2900f am 5d89308f: Add wakelock to audio HAL. Bug 2218158.
Merge commit '5d89308f2e1252eff2743bf823bf558dbb0de2fa' into eclair-mr2

* commit '5d89308f2e1252eff2743bf823bf558dbb0de2fa':
  Add wakelock to audio HAL. Bug 2218158.
2009-10-29 01:24:25 -07:00
Eric Laurent
0142ba88bf am fc023055: (-s ours) am 88316f70: am 0bf3ac2c: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit 'fc023055dba94779d5ab5455c1eab071e00a786e'

* commit 'fc023055dba94779d5ab5455c1eab071e00a786e':
  do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
2009-10-28 23:49:02 -07:00
Jean-Michel Trivi
b8dba8904e 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.
2009-10-28 17:24:53 -07:00
Eric Laurent
f3c6967b17 am 88316f70: am 0bf3ac2c: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit '88316f709083652c4aa9eca6f64631c0ec77fb07' into eclair-mr2-plus-aosp

* commit '88316f709083652c4aa9eca6f64631c0ec77fb07':
  do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
2009-10-28 10:42:53 -07:00
Eric Laurent
c21ca94f0f am 0bf3ac2c: (-s ours) 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
2009-10-28 10:26:39 -07:00
Dave Sparks
61e76b47a1 Add wakelock to audio HAL. Bug 2218158.
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.
2009-10-27 16:27:04 -07:00
Eric Laurent
52af604c93 do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
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.
2009-10-26 09:07:41 -07:00
Eric Laurent
b2984a2f52 am 2b6fb948: am a8eaa9a3: am 7eda9410: Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Merge commit '2b6fb9488422ae136a272eb7c2fb3409b3753618'

* commit '2b6fb9488422ae136a272eb7c2fb3409b3753618':
  Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
2009-10-24 01:58:02 -07:00
Eric Laurent
401d78acc4 am a8eaa9a3: am 7eda9410: Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
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.
2009-10-24 01:51:00 -07:00
Eric Laurent
2e01134db8 am 7eda9410: 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.
2009-10-24 01:39:05 -07:00
Eric Laurent
7996f999be 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)
2009-10-21 08:19:36 -07:00
Eric Laurent
ed39ad603d am 3bd76d78: am 6d14e709: Bluetooth A2DP suspend-resume improvements.
Merge commit '3bd76d781a412e96986eec13e3051b3f4ee73c4a'

* commit '3bd76d781a412e96986eec13e3051b3f4ee73c4a':
  Bluetooth A2DP suspend-resume improvements.
2009-10-20 00:51:02 -07:00
HK Chen
a81c636dbc am 5a9bd914: am 3cb88645: qsd8k: fix set_mic_mute() in AudioHardware.
Merge commit '5a9bd9145853d405614c04b6cb46b0aac9b5e643'

* commit '5a9bd9145853d405614c04b6cb46b0aac9b5e643':
  qsd8k: fix set_mic_mute() in AudioHardware.
2009-10-20 00:50:59 -07:00
Eric Laurent
b4638d0d98 am 6d14e709: Bluetooth A2DP suspend-resume improvements.
Merge commit '6d14e709e58488a67332fbeb0dd872ac18a19c17' into eclair-mr2-plus-aosp

* commit '6d14e709e58488a67332fbeb0dd872ac18a19c17':
  Bluetooth A2DP suspend-resume improvements.
2009-10-20 00:43:13 -07:00
HK Chen
1aa59df4b9 am 3cb88645: qsd8k: fix set_mic_mute() in AudioHardware.
Merge commit '3cb8864598e72c04859f410bb03f242cf3965dbe' into eclair-mr2-plus-aosp

* commit '3cb8864598e72c04859f410bb03f242cf3965dbe':
  qsd8k: fix set_mic_mute() in AudioHardware.
2009-10-20 00:43:11 -07:00
Eric Laurent
45fc65f5e1 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.
2009-10-16 10:19:01 -07:00
HK Chen
b5075dd3df qsd8k: fix set_mic_mute() in AudioHardware.
Signed-off-by: Brian Swetland <swetland@google.com>
2009-10-15 01:23:48 -07:00
Eric Laurent
e64d2eecb4 am 9cad54e0: am ba8101e9: Merge change I34a989e8 into eclair
Merge commit '9cad54e0ea6ad903b10a4fd8dd0e116328c5b416'

* commit '9cad54e0ea6ad903b10a4fd8dd0e116328c5b416':
2009-10-14 16:21:09 -07:00
Jean-Michel Trivi
4d75b93352 am 7b5d43fe: am 195d08b5: Fix bug 2172716. Align AudioPolicyManager code in msm7k/libaudio and msm7k/libaudio-qsd8k
Merge commit '7b5d43feb9489520eaeeed4a413954f81115e020'

* commit '7b5d43feb9489520eaeeed4a413954f81115e020':
2009-10-14 16:21:07 -07:00
Dima Zavin
6da5db92e5 am 3a6a4c27: am a6537357: gralloc-qsd8k: Call glFinish on composition complete.
Merge commit '3a6a4c2723affadfa882d969395ad248b91d5d58'

* commit '3a6a4c2723affadfa882d969395ad248b91d5d58':
2009-10-14 16:21:04 -07:00
Eric Laurent
0c29188c48 am ba8101e9: Merge change I34a989e8 into eclair
Merge commit 'ba8101e944ec0ffea2b89739667d3ce731d6e818'

* commit 'ba8101e944ec0ffea2b89739667d3ce731d6e818':
  Fix issue 2172934: AudioHardware for msm7k: some file descriptor tests must be fixed.
2009-10-13 17:00:24 -07:00