370 Commits

Author SHA1 Message Date
Iliyan Malchev
63e560401b am e7af7ee4: libaudio-qsd8k: enable separate in-call TTY settings
Merge commit 'e7af7ee40e27869a0cbbe4a5c91cbe6719fdfd44' into eclair-plus-aosp

* commit 'e7af7ee40e27869a0cbbe4a5c91cbe6719fdfd44':
  libaudio-qsd8k: enable separate in-call TTY settings
2010-02-09 09:26:01 -08:00
Iliyan Malchev
6052637fe6 libaudio-qsd8k: enable separate in-call TTY settings
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-02-08 15:58:37 -08:00
Eric Laurent
d3e127cdcc am ec78ad65: Partial fix 2422322: [Passion#VZW] audio issues found with release CL24761.
Merge commit 'ec78ad65a1110fe007c3bdaba824f66bbfe522e3' into eclair-plus-aosp

* commit 'ec78ad65a1110fe007c3bdaba824f66bbfe522e3':
  Partial fix 2422322: [Passion#VZW] audio issues found with release CL24761.
2010-02-05 09:50:53 -08:00
Eric Laurent
6c9e41a01b Partial fix 2422322: [Passion#VZW] audio issues found with release CL24761.
This Change fixes issues 1 and 2.1 reported by HTC.

Submitted on behalf of HK Chen <HK_Chen@htc.com>
2010-02-05 09:43:36 -08:00
Eric Laurent
9cb3de7e54 am 04b67c8c: Merge "Fix issue 2418435: Device is rebooted after pairing with A2DP/Bluetooth and made a call to other phone." into eclair
Merge commit '04b67c8c9fadfc174fb66aef3a31544707bd4b0d' into eclair-plus-aosp

* commit '04b67c8c9fadfc174fb66aef3a31544707bd4b0d':
  Fix issue 2418435: Device is rebooted after pairing with A2DP/Bluetooth and made a call to other phone.
2010-02-05 09:38:15 -08:00
Eric Laurent
9f78b4b74d Merge "Fix issue 2418435: Device is rebooted after pairing with A2DP/Bluetooth and made a call to other phone." into eclair 2010-02-05 09:31:13 -08:00
The Android Open Source Project
20f10d8544 am 3530ef81: reconcile main tree with open-source eclair
Merge commit '3530ef81d13e243bb568b8d33327f5fdda8a5b1a' into eclair-plus-aosp

* commit '3530ef81d13e243bb568b8d33327f5fdda8a5b1a':
  android-2.1_r1 snapshot
2010-02-05 08:49:52 -08:00
The Android Open Source Project
6390084fa4 reconcile main tree with open-source eclair 2010-02-05 08:09:38 -08:00
Eric Laurent
0b673f7c27 Fix issue 2418435: Device is rebooted after pairing with A2DP/Bluetooth and made a call to other phone.
This change removes the temporary fix for this issue.
The actual fix is in vendor/htc/passion/AudioBTID.csv.
2010-02-05 05:23:51 -08:00
Eric Laurent
16c161fcc6 am 2d319172: Temporary patch for issue 2419260.
Merge commit '2d319172300af10e139818ea367c4afc14c616f5' into eclair-plus-aosp

* commit '2d319172300af10e139818ea367c4afc14c616f5':
  Temporary patch for issue 2419260.
2010-02-04 12:01:11 -08:00
Eric Laurent
3f6a9031d1 Temporary patch for issue 2419260.
Comment out code that causes kernel crash reported in issue 2419260 until HTC provides a real fix.
2010-02-04 11:52:15 -08:00
Eric Laurent
1823b21524 am 17b4d724: Fix issue: 2413494: [Passion-c] Add TTY support.
Merge commit '17b4d724c2d8f3b70ae94ab523f584940d1c175a' into eclair-plus-aosp

* commit '17b4d724c2d8f3b70ae94ab523f584940d1c175a':
  Fix issue: 2413494: [Passion-c] Add TTY support.
2010-02-04 09:34:37 -08:00
Eric Laurent
0cef292e23 Fix issue: 2413494: [Passion-c] Add TTY support.
AudioHardware receives TTY mode selection from HeadsetObserver by means of the setParameters() method.
Whenever the audio mode is MODE_IN_CALL and a headset is connected, the sound device selection
is modified by TTY mode in order to select TTY full, VCO ot HCO oudio routes and a1026 configuations accordingly.
2010-02-03 23:35:06 -08:00
Iliyan Malchev
52c16eb522 am f92ef8fe: libaudio-qsd8k: updates for passionc
Merge commit 'f92ef8fe452d3f8742d3aa680d1a443f571f028d' into eclair-plus-aosp

* commit 'f92ef8fe452d3f8742d3aa680d1a443f571f028d':
  libaudio-qsd8k: updates for passionc
2010-02-03 14:16:53 -08:00
Iliyan Malchev
cb2ec0c1f0 am 9ab0b5b1: libaudio-qsd8k: fix a1026.h kernel header include
Merge commit '9ab0b5b1f3244f261fcda2ead8fcdd5fe5d714b6' into eclair-plus-aosp

* commit '9ab0b5b1f3244f261fcda2ead8fcdd5fe5d714b6':
  libaudio-qsd8k: fix a1026.h kernel header include
2010-02-02 14:19:01 -08:00
Iliyan Malchev
2b2d936767 libaudio-qsd8k: updates for passionc
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-02-02 13:46:58 -08:00
Iliyan Malchev
abb2ce35f7 libaudio-qsd8k: fix a1026.h kernel header include
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-02-02 12:27:15 -08:00
The Android Open Source Project
96112ea629 reconcile android-2.1_r1 snapshot 2010-01-29 14:09:19 -08:00
Eric Laurent
dd67a94c48 am c42d5b9b: Fix issue 2378103: Bluetooth car kit partly handled by Passion AudioHardware implementation.
Merge commit 'c42d5b9bd789034e4e10679b24a7bd38e68f4556' into eclair-plus-aosp

* commit 'c42d5b9bd789034e4e10679b24a7bd38e68f4556':
  Fix issue 2378103: Bluetooth car kit partly handled by Passion AudioHardware implementation.
2010-01-20 10:06:46 -08:00
Eric Laurent
28d83cacec Fix issue 2378103: Bluetooth car kit partly handled by Passion AudioHardware implementation.
libaudio: handle audio path SND_DEVICE_CARKIT.
Submitted on behalf of HK Chen <HK_Chen@htc.com>

Added missing code from HK patch in A1026 configuration.
2010-01-20 07:35:43 -08:00
Eric Laurent
584b80dbed am 3964d4ed: Fix issue 2199233: ERD16 Incall volume with headset is crazy loud / volume buttons have no effect
Merge commit '3964d4ed448b00791bc1b574913be24f44b45f0f' into eclair-plus-aosp

* commit '3964d4ed448b00791bc1b574913be24f44b45f0f':
  Fix issue 2199233: ERD16 Incall volume with headset is crazy loud / volume buttons have no effect
2010-01-19 19:59:31 -08:00
Eric Laurent
feb072009b Fix issue 2199233: ERD16 Incall volume with headset is crazy loud / volume buttons have no effect
A regression was introduced by commit 372b6255604d1c54d31e79f1ea31472fe5bc8956 fixing issue 2336461:
 voice call volume still needs to be updated when entering IN_CALL mode.
2010-01-18 11:25:47 -08:00
Jean-Michel Trivi
9a3a36b091 am a73c739f: Patch from HTC: fine-tuned acoustic parameters for car-dock wasn\'t loaded correctly.
Merge commit 'a73c739fbc7641c4d81960328aced549ef3f5c0b' into eclair-plus-aosp

* commit 'a73c739fbc7641c4d81960328aced549ef3f5c0b':
  Patch from HTC: fine-tuned acoustic parameters for car-dock wasn't loaded correctly.
2010-01-13 16:37:48 -08:00
Jean-Michel Trivi
54c67204c7 Patch from HTC: fine-tuned acoustic parameters for car-dock wasn't loaded correctly. 2010-01-13 16:11:52 -08:00
The Android Open Source Project
44311757be android-2.1_r1 snapshot 2010-01-12 15:19:05 -08:00
Eric Laurent
1e4eb98d7f am 372b6255: Fix issue 2336461: [Passion] one issue about in-call downlink volume degration.
Merge commit '372b6255604d1c54d31e79f1ea31472fe5bc8956' into eclair-plus-aosp

* commit '372b6255604d1c54d31e79f1ea31472fe5bc8956':
  Fix issue 2336461: [Passion] one issue about in-call downlink volume degration.
2010-01-11 12:26:18 -08:00
Eric Laurent
ad9454a375 Fix issue 2336461: [Passion] one issue about in-call downlink volume degration.
This change reverts modifications made earlier on software voice volume control in audio policy manager.
These modifications are not needed anymore and are partly responsible of this issue now that voice volume is controlled by audio DSP.
2009-12-23 02:40:46 -08:00
Eric Laurent
1d3e56aaa2 am 7500eded: Fix issues 2333450 and 2333559:
Merge commit '7500eded35ce173525d7fc1e8172679188d3b33a' into eclair-plus-aosp

* commit '7500eded35ce173525d7fc1e8172679188d3b33a':
  Fix issues 2333450 and 2333559:
2009-12-22 23:42:05 -08:00
Eric Laurent
747fe9dee4 Fix issues 2333450 and 2333559:
Add new config values for usage AudioSystem::FOR_DOCK in setForceUse() to differenciate car and desk docks.
For the desk dock, the sonification strategy will use the phone speaker only as there is no guaranty that
a device is connected to the dock's output jack.
For the car dock, the sonification strategy will use the A2DP output as before.
2009-12-17 10:25:47 -08:00
Jean-Michel Trivi
b188c2ad08 am 9ffa8682: Use the media.enable1026 system property to indicate whether the dual microphone noise suppression should be used during a phone call in handset mode. The disabling is performed by using the same A1026 settings as those used in Voice Recognition when not
Merge commit '9ffa86825c57c8bf82669b438bd0e8feb865d4b7' into eclair-plus-aosp

* commit '9ffa86825c57c8bf82669b438bd0e8feb865d4b7':
  Use the media.enable1026 system property to indicate whether the
2009-12-16 13:02:43 -08:00
Jean-Michel Trivi
44f3cda621 Use the media.enable1026 system property to indicate whether the
dual microphone noise suppression should be used during a phone call
in handset mode. The disabling is performed by using the same A1026
settings as those used in Voice Recognition when not using the
Noise Suppression algorithm. This mode uses the exact same input
and gains as the incall receiver mode (A1026_PATH_INCALL_RECEIVER)
A new mode (A1026_PATH_INCALL_NO_NS_RECEIVER) is defined for code
clarity.
2009-12-15 20:43:36 -08:00
Eric Laurent
0c8b243d33 am e0042598: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8' into eclair-plus-aosp

* commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 10:51:37 -08:00
Eric Laurent
c7e6a92679 Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
This correction in AudioPolicyManager does not directly fix the issue but a potential problem identified when working on the resolution.
The problem is that audio output path is not updated immediately when a headset is unplugged if music or notifications are active. This is however not observable because:
- music is paused by music app when the headset is unplugged, and correct path is re-established when music is resumed.
- ringtones and notifications are playing on both headset and speaker and are still audible on speaker when the headset is unplugged even if
the actual output path is not changed to speaker only.

There could be an impact on applications using MUSIC stream and not reacting to Intent AudioManager.ACTION_AUDIO_BECOMING_NOISY though.
2009-12-14 02:56:04 -08:00
Dima Zavin
be70353ef5 am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '2754389d0e7638b3065ecb3c965b1f262d2205ed' into eclair-plus-aosp

* commit '2754389d0e7638b3065ecb3c965b1f262d2205ed':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-09 21:19:13 -08:00
Dima Zavin
7e8932dad3 gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Change-Id: Ic05b895c09a55d746c737aa0c3356edc511d7c96
Signed-off-by: Dima Zavin <dima@android.com>
2009-12-09 21:13:44 -08:00
Jean-Michel Trivi
7a6a73ce90 am 9df12adc: Merge change I667fff6d into eclair
Merge commit '9df12adc2ff87eef733b948255f2960ca070981a' into eclair-plus-aosp

* commit '9df12adc2ff87eef733b948255f2960ca070981a':
  Fix bug 2111240 When docked to a BT dock, give priority to wired
2009-12-09 11:50:40 -08:00
Android (Google) Code Review
8451e38453 Merge change I667fff6d into eclair
* changes:
  Fix bug 2111240 When docked to a BT dock, give priority to wired accessories over BT, and don't duplicate outputs for notifications.
2009-12-09 11:47:01 -08:00
Jean-Michel Trivi
4fc9cbccc1 Fix bug 2111240 When docked to a BT dock, give priority to wired
accessories over BT, and don't duplicate outputs for notifications.
2009-12-09 10:32:03 -08:00
Mathias Agopian
f0b1589f21 am f7e40a33: improve cache behavior of gralloc allocations on qsd8k
Merge commit 'f7e40a3311ae78b3edd9259980c224a5a9d91653' into eclair-plus-aosp

* commit 'f7e40a3311ae78b3edd9259980c224a5a9d91653':
  improve cache behavior of gralloc allocations on qsd8k
2009-12-09 05:36:20 -08:00
Mathias Agopian
e17d093d0c improve cache behavior of gralloc allocations on qsd8k
make sure to use cached buffers only when frequent cpu access is needed.
also, always flush buffers after they are allocated and cleared.
2009-12-08 19:34:43 -08:00
Eric Laurent
f8e13f24f5 am 9c3ea922: Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Merge commit '9c3ea9222f761ae445062a706d77804fcc7a5703' into eclair-plus-aosp

* commit '9c3ea9222f761ae445062a706d77804fcc7a5703':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:03:45 -08:00
Eric Laurent
148f11328f Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Fixed AudioPolicyManager::getInput() broken in change ddb78e7753be03937ad57ce7c3c842c52bdad65e
so that an invalid IO handle (0) is returned in case of failure.
Applied the same correction to getOutput().
2009-12-07 04:23:46 -08:00
Dima Zavin
90fc0a8598 am dc80f522: gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
Merge commit 'dc80f522f23ecda902bf8ddf5de68d6fe10e2c05' into eclair-plus-aosp

* commit 'dc80f522f23ecda902bf8ddf5de68d6fe10e2c05':
  gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
2009-12-04 20:26:03 -08:00
Dima Zavin
6d4fd653ce gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
Change-Id: Ic41d4854d6acbc21c85a03e82bd63af234273886
Signed-off-by: Dima Zavin <dima@android.com>
2009-12-04 20:22:41 -08:00
Dima Zavin
7b2773b1a8 am c3f00492: gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
Merge commit 'c3f00492488dec0b8eaa5d28aac1bcc8ca899a3c' into eclair-plus-aosp

* commit 'c3f00492488dec0b8eaa5d28aac1bcc8ca899a3c':
  gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
2009-12-04 17:48:32 -08:00
Dima Zavin
62447949f2 gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
We really need to fix this eventually, but it's not a ship blocker.

Change-Id: I35f66988e7adba13e47c2a86e13a7425cc5aada3
Signed-off-by: Dima Zavin <dima@android.com>
2009-12-04 15:41:54 -08:00
Eric Laurent
30b2a80918 am cda6ed31: Fix issue 2304701: Media streams can remain muted on A2DP output.
Merge commit 'cda6ed314ac73ffaeb0350056c84fc0d8b7b58ea' into eclair-plus-aosp

* commit 'cda6ed314ac73ffaeb0350056c84fc0d8b7b58ea':
  Fix issue 2304701: Media streams can remain muted on A2DP output.
2009-12-04 10:38:38 -08:00
Eric Laurent
5cc6387254 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.
2009-12-04 07:01:06 -08:00
Dima Zavin
b97436d65c am 49a5c99a: libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
Merge commit '49a5c99a84626b5b1db4eda5239307e3366e28fa' into eclair-plus-aosp

* commit '49a5c99a84626b5b1db4eda5239307e3366e28fa':
  libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
2009-12-03 02:16:37 -08:00
Dima Zavin
be6f97aad3 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>
2009-12-02 21:15:33 -08:00