Commit Graph

274 Commits

Author SHA1 Message Date
HK Chen
2b44244851 am 02b088fe: am 7161d052: Fix get_snd_dev() in AudioHardware.
Merge commit '02b088fe2fdc2d61dbee5af3c52bbd2144b66dd8'

* commit '02b088fe2fdc2d61dbee5af3c52bbd2144b66dd8':
  Fix get_snd_dev() in AudioHardware.
2009-09-29 11:11:52 -07:00
HK Chen
c4bc52ded6 am 7161d052: Fix get_snd_dev() in AudioHardware.
Merge commit '7161d052ce69228825bd5deca3bfa4a213a99f06' into eclair-plus-aosp

* commit '7161d052ce69228825bd5deca3bfa4a213a99f06':
  Fix get_snd_dev() in AudioHardware.
2009-09-28 16:18:53 -07:00
HK Chen
2d2802d283 Fix get_snd_dev() in AudioHardware. 2009-09-28 14:58:06 -07:00
Jean-Michel Trivi
387c595bcc am cb323590: am 9b5caf53: Merge change 27062 into eclair
Merge commit 'cb32359081c08d147bdb0569de21ceed59b57fc9'

* commit 'cb32359081c08d147bdb0569de21ceed59b57fc9':
  Fix bug 2146274. Modify the Audio Policy Manager
2009-09-27 15:39:55 -07:00
Jean-Michel Trivi
500868d0c0 am 9b5caf53: Merge change 27062 into eclair
Merge commit '9b5caf539136ccc1106b49155f531f5e70b41ba0' into eclair-plus-aosp

* commit '9b5caf539136ccc1106b49155f531f5e70b41ba0':
  Fix bug 2146274. Modify the Audio Policy Manager
2009-09-25 15:10:38 -07:00
Android (Google) Code Review
ac5de163ca Merge change 27062 into eclair
* 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.
2009-09-25 18:01:44 -04:00
HK Chen
ae84218649 am 511722f3: am 31923bb6: qsd8k: audio: remove pre-filling buffers for pcm playback.
Merge commit '511722f38480f2fba2b579ba3c59dc6c817a00d1'

* commit '511722f38480f2fba2b579ba3c59dc6c817a00d1':
  qsd8k: audio: remove pre-filling buffers for pcm playback.
2009-09-25 11:15:16 -07:00
Dima Zavin
99768a3763 am b8e3c56c: am afff0dae: copybit: hack to always request premultiplied alpha blend.
Merge commit 'b8e3c56c4b9045b16401698e46be40b6e7b454e0'

* commit 'b8e3c56c4b9045b16401698e46be40b6e7b454e0':
  copybit: hack to always request premultiplied alpha blend.
2009-09-25 11:11:48 -07:00
Jean-Michel Trivi
5312b467f3 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.

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.
2009-09-25 10:53:27 -07:00
HK Chen
9be14a004c am 31923bb6: qsd8k: audio: remove pre-filling buffers for pcm playback.
Merge commit '31923bb6797ec304d26395acf6d946ab8e44aa6e' into eclair-plus-aosp

* commit '31923bb6797ec304d26395acf6d946ab8e44aa6e':
  qsd8k: audio: remove pre-filling buffers for pcm playback.
2009-09-24 17:23:42 -07:00
HK Chen
c71bbda56f qsd8k: audio: remove pre-filling buffers for pcm playback.
Signed-off-by: Brian Swetland <swetland@google.com>
2009-09-24 17:09:27 -07:00
Dima Zavin
f5f80e0bf4 am afff0dae: copybit: hack to always request premultiplied alpha blend.
Merge commit 'afff0dae18bbea0b39ad151e73ae20cbc11e3edd' into eclair-plus-aosp

* commit 'afff0dae18bbea0b39ad151e73ae20cbc11e3edd':
  copybit: hack to always request premultiplied alpha blend.
2009-09-24 14:53:26 -07:00
Dima Zavin
d24467414b copybit: hack to always request premultiplied alpha blend.
The kernel will only do it for images with an alpha plane.

Change-Id: Idcba41945ed7d17daae0a5bcc48c64a82a49dded
Signed-off-by: Dima Zavin <dima@android.com>
2009-09-24 01:10:49 -07:00
Eric Laurent
3a35434294 am c96a375c: am dc4d5ad6: 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 '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.
2009-09-17 05:28:03 -07:00
Eric Laurent
d51416731c am dc4d5ad6: 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.
2009-09-15 09:23:40 -07:00
Eric Laurent
3dfe38ac24 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.
2009-09-15 08:22:39 -07:00
Eric Laurent
10f610cbb9 am 91205c41: am 56357dc9: Merge change 23947 into eclair
Merge commit '91205c41286a28a9714e8147e6a996e5dd56cd9a'

* commit '91205c41286a28a9714e8147e6a996e5dd56cd9a':
  Fix issue 2100324: Limit ringtone and notifications volume when a headset is connected.
2009-09-09 13:41:36 -07:00
Dima Zavin
8c7e28b975 am ca152e5e: am c9410082: libcopybit: Fix typo, and the build
Merge commit 'ca152e5eeb74d38e00324b93e22fc70008eca5cf'

* commit 'ca152e5eeb74d38e00324b93e22fc70008eca5cf':
  libcopybit: Fix typo, and the build
2009-09-09 10:59:13 -07:00
Mathias Agopian
0781a2c71e am b243350c: am 3f204e86: QSD8K supports 8x scaling
Merge commit 'b243350cef8544f9755669c2ba9dc482ba5ddcc6'

* commit 'b243350cef8544f9755669c2ba9dc482ba5ddcc6':
  QSD8K supports 8x scaling
2009-09-09 10:59:03 -07:00
Eric Laurent
ca6233b9a4 am 56357dc9: Merge change 23947 into eclair
Merge commit '56357dc98d4b886dcaa7218fe9286eae8bb6b8ad' into eclair-plus-aosp

* commit '56357dc98d4b886dcaa7218fe9286eae8bb6b8ad':
  Fix issue 2100324: Limit ringtone and notifications volume when a headset is connected.
2009-09-08 22:42:23 -07:00
Android (Google) Code Review
0cbca01ed2 Merge change 23947 into eclair
* changes:
  Fix issue 2100324: Limit ringtone and notifications volume when a headset is connected.
2009-09-08 22:40:06 -07:00
Dima Zavin
6e1bc508f6 am c9410082: libcopybit: Fix typo, and the build
Merge commit 'c9410082453abfb6eaaf43e6c97e04711d0751c0' into eclair-plus-aosp

* commit 'c9410082453abfb6eaaf43e6c97e04711d0751c0':
  libcopybit: Fix typo, and the build
2009-09-08 18:56:15 -07:00
Dima Zavin
03f9cb24dd libcopybit: Fix typo, and the build
Change-Id: I4f75e7ee4eff4f6159099de92ae3b4501ad7474a
Signed-off-by: Dima Zavin <dima@android.com>
2009-09-08 18:49:41 -07:00
Mathias Agopian
b18946ebc9 am 3f204e86: QSD8K supports 8x scaling
Merge commit '3f204e86d4a4449fa6196ba26e668d345e24bfb1' into eclair-plus-aosp

* commit '3f204e86d4a4449fa6196ba26e668d345e24bfb1':
  QSD8K supports 8x scaling
2009-09-08 18:07:17 -07:00
Mathias Agopian
f2d52d61f9 QSD8K supports 8x scaling 2009-09-08 16:18:51 -07:00
Jean-Baptiste Queru
b5312d8f23 am 17699b38: merge from open-source master
Merge commit '17699b38df6e87e301d3b33c6955a15c097ecaff'

* commit '17699b38df6e87e301d3b33c6955a15c097ecaff':
2009-09-04 11:06:38 -07:00
Jean-Baptiste Queru
fd17c0c6ed merge from open-source master 2009-09-04 07:51:13 -07:00
Eric Laurent
c9e1cbd5c9 Fix issue 2100324: Limit ringtone and notifications volume when a headset is connected.
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.
2009-09-04 02:38:50 -07:00
Jean-Baptiste Queru
2004b50196 merge from donut 2009-09-03 14:13:11 -07:00
Iliyan Malchev
0635134992 am 67bfa63f: Merge change 23733 into eclair
Merge commit '67bfa63fae1e80d8aedd966c6f0a0e823c93f0b1'

* commit '67bfa63fae1e80d8aedd966c6f0a0e823c93f0b1':
  liblights: fix LED transitions when an amber LED is supported
2009-09-02 17:18:34 -07:00
Android (Google) Code Review
4640d3dde0 Merge change 23733 into eclair
* changes:
  liblights: fix LED transitions when an amber LED is supported
2009-09-02 17:14:18 -07:00
Brian Swetland
6f39863d09 am 7aa42c0b: Merge change 23567 into eclair
Merge commit '7aa42c0bfbf8ac67588adc4a6674731c9f36cb94'

* commit '7aa42c0bfbf8ac67588adc4a6674731c9f36cb94':
  libaudio-qsd8k: very rough cut of 8k audio support
2009-09-02 16:32:23 -07:00
Android (Google) Code Review
fc90c2461f Merge change 23567 into eclair
* changes:
  libaudio-qsd8k: very rough cut of 8k audio support
2009-09-02 16:27:15 -07:00
Iliyan Malchev
c7aa563636 liblights: fix LED transitions when an amber LED is supported
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-09-02 16:14:13 -07:00
Mike Lockwood
5cbe4e39ee am 2d58bd7a: librpc: Support new RPC major/minor versioning scheme.
Merge commit '2d58bd7a2d839f2871eb35856897ebcb7ead528b'

* commit '2d58bd7a2d839f2871eb35856897ebcb7ead528b':
  librpc: Support new RPC major/minor versioning scheme.
2009-09-02 13:33:15 -07:00
Mike Lockwood
1a4cba4225 librpc: Support new RPC major/minor versioning scheme.
Change-Id: I31035c8ace5f6db6694d699fa778e08f1a061dbc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-01 21:55:10 -04:00
Brian Swetland
9bad96082a libaudio-qsd8k: very rough cut of 8k audio support
This really needs a lot of cleanup and AudioPolicyManager should be
shared with the 7k bits, etc, etc.
2009-09-01 18:52:58 -07:00
Eric Laurent
5645e52850 am 0067987b: Fix issue 2091594: music chirp after disconnecting A2DP.
Merge commit '0067987bcb374646df59338eeeaec01e9b8bb73d'

* commit '0067987bcb374646df59338eeeaec01e9b8bb73d':
  Fix issue 2091594: music chirp after disconnecting A2DP.
2009-09-01 12:15:11 -07:00
Eric Laurent
57417552c3 Fix issue 2091594: music chirp after disconnecting A2DP.
Mute media streams during 2 seconds while the music is being switched from A2DP output to hardware output and before it is paused by the music application.
Also improve code readability by using pointers to output descriptors.
2009-09-01 05:56:08 -07:00
Eric Laurent
38c4d94ced am 74f248ff: Merge change 23296 into eclair
Merge commit '74f248ff46374b7ea3084ed7ed5926f3d39ac506'

* commit '74f248ff46374b7ea3084ed7ed5926f3d39ac506':
  Fix issue 2085730: AudioPolicyManager: The A2DP output descriptor is not released if the associated duplicated output cannot be opened.
2009-08-31 23:30:21 -07:00
Android (Google) Code Review
79a061bf2d Merge change 23296 into eclair
* changes:
  Fix issue 2085730: AudioPolicyManager: The A2DP output descriptor is not released if the associated duplicated output cannot be opened.
2009-08-31 23:25:32 -07:00
Mike Lockwood
c30f1df66e am 8aab2bba: Merge change 23299 into eclair
Merge commit '8aab2bba26dde82efc77afdc001e32cc199e039d'

* commit '8aab2bba26dde82efc77afdc001e32cc199e039d':
  liblights: Use constants instead of hard coded file paths.
2009-08-31 16:44:53 -07:00
Eric Laurent
a55a4376a0 am aa1d75e6: Fix issue 2085911: Volume control is broken when A2DP headset is connected.
Merge commit 'aa1d75e66a38efdce21e944b5ddbe42ad634480f'

* commit 'aa1d75e66a38efdce21e944b5ddbe42ad634480f':
  Fix issue 2085911: Volume control is broken when A2DP headset is connected.
2009-08-31 16:43:43 -07:00
Android (Google) Code Review
09c284b754 Merge change 23299 into eclair
* changes:
  liblights: Use constants instead of hard coded file paths.
2009-08-31 12:25:16 -07:00
Mike Lockwood
30e54207f5 liblights: Use constants instead of hard coded file paths.
Change-Id: I87d1b64a2d67ef3674232aa0c48fac4f8f8f3ace
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-31 13:32:51 -04:00
Jean-Baptiste Queru
045d5f482f merge new donut version into open-source variant 2009-08-31 10:03:38 -07:00
Eric Laurent
9dc608646d Fix issue 2085730: AudioPolicyManager: The A2DP output descriptor is not released if the associated duplicated output cannot be opened.
The fix consists in deallocating the A2DP output descriptor when the duplicated output opening fails in AudioPolicyManager::setDeviceConnectionState().
2009-08-31 09:31:03 -07:00
Eric Laurent
28cc97ea3e Fix issue 2085911: Volume control is broken when A2DP headset is connected.
A regression on volume control was introduced by change 22899. When a volume change was requested on 2 different outputs for the same stream, the change on the second output was ignored because the requested value was the same as current one.
The fix consists in storing current stream volume for each output instead of globally for all outputs.
2009-08-31 00:24:53 -07:00
Eric Laurent
35c457f6b5 am 63ca66ea: Fix issue 2080258: audio routing is not reset when call ends.
Merge commit '63ca66ea9da5ea61806ee547f3aa1c498ac235fe'

* commit '63ca66ea9da5ea61806ee547f3aa1c498ac235fe':
  Fix issue 2080258: audio routing is not reset when call ends.
2009-08-27 23:53:16 -07:00
Eric Laurent
060f98e062 Fix issue 2080258: audio routing is not reset when call ends.
Modify AudioPolicyManager::setPhoneState() to force a routing command to audio output when call ends or starts even if the same device is selected.
Implement AudioHardware::setMode() to force routing change to be taken into account when phone state changes.
2009-08-27 11:49:33 -07:00