409 Commits

Author SHA1 Message Date
Eric Laurent
458014e402 am 82f9e100: am e0042598: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit '82f9e10095156bbfdd208216c286304ea0dad260' into eclair-mr2-plus-aosp

* commit '82f9e10095156bbfdd208216c286304ea0dad260':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 12:08:16 -08:00
Eric Laurent
6b84c7deaf am e0042598: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8' into eclair-mr2

* commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 10:51:38 -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
3365529b73 am 6a6befc0: am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '6a6befc0430820ab5d837694f1b71b63c34f8b14' into eclair-mr2-plus-aosp

* commit '6a6befc0430820ab5d837694f1b71b63c34f8b14':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-10 18:08:20 -08:00
Dima Zavin
8533232290 am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '2754389d0e7638b3065ecb3c965b1f262d2205ed' into eclair-mr2

* commit '2754389d0e7638b3065ecb3c965b1f262d2205ed':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-10 17:56:59 -08:00
Jean-Michel Trivi
dfa9174e19 am 259ede35: am 9df12adc: Merge change I667fff6d into eclair
Merge commit '259ede35b4d8d50d0394624780733e4c061fbe7e' into eclair-mr2-plus-aosp

* commit '259ede35b4d8d50d0394624780733e4c061fbe7e':
  Fix bug 2111240 When docked to a BT dock, give priority to wired
2009-12-10 16:58:42 -08:00
Mathias Agopian
d36a65ee14 am 8efc64ae: am f7e40a33: improve cache behavior of gralloc allocations on qsd8k
Merge commit '8efc64aec14e80e7dff8eb4e7708195c6d693ec8' into eclair-mr2-plus-aosp

* commit '8efc64aec14e80e7dff8eb4e7708195c6d693ec8':
  improve cache behavior of gralloc allocations on qsd8k
2009-12-10 16:58:39 -08:00
Jean-Michel Trivi
7f32c36ce4 am 9df12adc: Merge change I667fff6d into eclair
Merge commit '9df12adc2ff87eef733b948255f2960ca070981a' into eclair-mr2

* commit '9df12adc2ff87eef733b948255f2960ca070981a':
  Fix bug 2111240 When docked to a BT dock, give priority to wired
2009-12-10 16:46:17 -08:00
Mathias Agopian
cbe53680bf am f7e40a33: improve cache behavior of gralloc allocations on qsd8k
Merge commit 'f7e40a3311ae78b3edd9259980c224a5a9d91653' into eclair-mr2

* commit 'f7e40a3311ae78b3edd9259980c224a5a9d91653':
  improve cache behavior of gralloc allocations on qsd8k
2009-12-10 16:43:17 -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
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
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
baedcde0f0 am 15793970: 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 '15793970b52db6b64ee3d0c591287200fd882429' into eclair-mr2-plus-aosp

* commit '15793970b52db6b64ee3d0c591287200fd882429':
  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:06:24 -08:00
Eric Laurent
5bfddd3d45 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-mr2

* 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:21 -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
12bfa4344a am 288cb24b: am dc80f522: gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
Merge commit '288cb24be01d065843a2a98ed6c0fdbb5faa8268' into eclair-mr2-plus-aosp

* commit '288cb24be01d065843a2a98ed6c0fdbb5faa8268':
  gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
2009-12-04 20:28:16 -08:00
Dima Zavin
ce844ce07c am dc80f522: gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
Merge commit 'dc80f522f23ecda902bf8ddf5de68d6fe10e2c05' into eclair-mr2

* commit 'dc80f522f23ecda902bf8ddf5de68d6fe10e2c05':
  gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
2009-12-04 20:25:50 -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
760c00fcd1 am 7422163d: am c3f00492: gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
Merge commit '7422163dfcbad4997d30274bb7c438997269ae4d' into eclair-mr2-plus-aosp

* commit '7422163dfcbad4997d30274bb7c438997269ae4d':
  gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
2009-12-04 17:50:21 -08:00
Eric Laurent
b226bcc64e am dc8efbf8: am cda6ed31: Fix issue 2304701: Media streams can remain muted on A2DP output.
Merge commit 'dc8efbf8be019fa34e9b83039cf4b5b070f3ae28' into eclair-mr2-plus-aosp

* commit 'dc8efbf8be019fa34e9b83039cf4b5b070f3ae28':
  Fix issue 2304701: Media streams can remain muted on A2DP output.
2009-12-04 17:50:18 -08:00
Dima Zavin
3d70fea63c am c3f00492: gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
Merge commit 'c3f00492488dec0b8eaa5d28aac1bcc8ca899a3c' into eclair-mr2

* commit 'c3f00492488dec0b8eaa5d28aac1bcc8ca899a3c':
  gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
2009-12-04 17:48:11 -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
aa54a1d39b am cda6ed31: Fix issue 2304701: Media streams can remain muted on A2DP output.
Merge commit 'cda6ed314ac73ffaeb0350056c84fc0d8b7b58ea' into eclair-mr2

* commit 'cda6ed314ac73ffaeb0350056c84fc0d8b7b58ea':
  Fix issue 2304701: Media streams can remain muted on A2DP output.
2009-12-04 10:39:33 -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
3c2fc5ff52 am e817fcde: am 49a5c99a: libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
Merge commit 'e817fcdedf46750b4ef57c8eeec0d44d5c46a252' into eclair-mr2-plus-aosp

* commit 'e817fcdedf46750b4ef57c8eeec0d44d5c46a252':
  libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
2009-12-03 02:21:01 -08:00
Dima Zavin
936ac4f834 am 49a5c99a: libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
Merge commit '49a5c99a84626b5b1db4eda5239307e3366e28fa' into eclair-mr2

* commit '49a5c99a84626b5b1db4eda5239307e3366e28fa':
  libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
2009-12-03 02:16:39 -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
Jean-Michel Trivi
b013d73092 am 8c2b7b65: am fea8b9e5: Merge change I14a54ae2 into eclair
Merge commit '8c2b7b65f3f78181a5b04933f54a56b8eb6884d5' into eclair-mr2-plus-aosp

* commit '8c2b7b65f3f78181a5b04933f54a56b8eb6884d5':
  Patch from HTC: changes in libaudio
2009-12-01 17:30:17 -08:00
Eric Laurent
5bf5a33586 am 44f72974: am 0a656145: Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Merge commit '44f72974bfba0821f5080617b23f8706b86592b1' into eclair-mr2-plus-aosp

* commit '44f72974bfba0821f5080617b23f8706b86592b1':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-12-01 17:30:13 -08:00
Jean-Michel Trivi
5d4176a70a am fea8b9e5: Merge change I14a54ae2 into eclair
Merge commit 'fea8b9e5641e1bdf8498b39cf108971c6fd130f8' into eclair-mr2

* commit 'fea8b9e5641e1bdf8498b39cf108971c6fd130f8':
  Patch from HTC: changes in libaudio
2009-12-01 17:15:26 -08:00
Eric Laurent
6fd07bc2e5 am 0a656145: Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Merge commit '0a6561450eddb6b13f56392fb116d6ed2ef3694f' into eclair-mr2

* commit '0a6561450eddb6b13f56392fb116d6ed2ef3694f':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-12-01 17:04:30 -08:00
Android (Google) Code Review
3b81370104 Merge change I14a54ae2 into eclair
* 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.
2009-11-30 16:24:27 -08:00
Eric Laurent
b65217ffe2 Fix issue 2192673: Music Pausing Even when notifications are set to silent.
If a stream cannot be muted (ENFORCED_AUDIBLE stream in some countries), make sure that getStreamVolumeIndex()
returns the actual stream volume.
2009-11-27 05:06:23 -08:00
Jean-Michel Trivi
e204be3647 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.
2009-11-24 16:40:49 -08:00
Mathias Agopian
9864ae09c9 am 83fb1ada: am bd94d9af: part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
Merge commit '83fb1ada26d894c807686a93925c1e255fddb28c' into eclair-mr2-plus-aosp

* commit '83fb1ada26d894c807686a93925c1e255fddb28c':
  part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
2009-11-24 14:53:09 -08:00
Mathias Agopian
46d61081aa am bd94d9af: part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
Merge commit 'bd94d9af5cc7067b0e849af076183626b4c32e4e' into eclair-mr2

* commit 'bd94d9af5cc7067b0e849af076183626b4c32e4e':
  part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
2009-11-24 14:43:43 -08:00
Mathias Agopian
1e1a87f0a5 part of fix [2186418] switch qsd8k devices to 24-bits framebuffer
Add support for 32 bits framebuffers
2009-11-23 23:19:54 -08:00
Eric Laurent
eb06525677 am 7b42088c: am 8a5a107a: Improvement for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes.
Merge commit '7b42088ca83a32ebe57d1d91396a8cb45d45aa6c' into eclair-mr2-plus-aosp

* commit '7b42088ca83a32ebe57d1d91396a8cb45d45aa6c':
  Improvement for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes.
2009-11-23 08:18:56 -08:00
Eric Laurent
18bc60c29a am 50c579e8: am a4fe0167: Issue 2276684: Kernel audio driver should fully support AUDIO_SET_CONFIG.
Merge commit '50c579e86f257a7bc22e43c4c7b791994d38bb7e' into eclair-mr2-plus-aosp

* commit '50c579e86f257a7bc22e43c4c7b791994d38bb7e':
  Issue 2276684: Kernel audio driver should fully support AUDIO_SET_CONFIG.
2009-11-23 08:18:53 -08:00
Eric Laurent
45c3c9be98 am 8a5a107a: Improvement for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes.
Merge commit '8a5a107a014f94e6335b88f1942c82d23ceb6b04' into eclair-mr2

* commit '8a5a107a014f94e6335b88f1942c82d23ceb6b04':
  Improvement for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes.
2009-11-23 08:16:12 -08:00
Eric Laurent
bbb5f58f76 Improvement for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes.
Change audio buffer count to match number of buffers used by audio dsp.
Change buffer size from 4800 bytes to 3072 bytes to reduce output latency.
2009-11-21 00:45:02 -08:00
Eric Laurent
e339ff0e60 am a4fe0167: Issue 2276684: Kernel audio driver should fully support AUDIO_SET_CONFIG.
Merge commit 'a4fe0167c6cad83d88b3bc56efa1ffad85b345b5' into eclair-mr2

* commit 'a4fe0167c6cad83d88b3bc56efa1ffad85b345b5':
  Issue 2276684: Kernel audio driver should fully support AUDIO_SET_CONFIG.
2009-11-20 12:23:03 -08:00
Eric Laurent
d8c81ab5d3 Issue 2276684: Kernel audio driver should fully support AUDIO_SET_CONFIG.
Align HAL audio input buffer size with kernel driver for the time being.

For mr2 release the driver shall support AUDIO_SET_CONFIG.
2009-11-20 09:57:40 -08:00
Jean-Michel Trivi
2400a8a44c am 0fd7c5be: am 58cf88a5: 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
Merge commit '0fd7c5be0e7e7f1013617ed2da24941c596a2137' into eclair-mr2-plus-aosp

* commit '0fd7c5be0e7e7f1013617ed2da24941c596a2137':
  Patch from HTC related to use of camcorder with wired headset plugged in:
2009-11-19 11:48:53 -08:00
Jean-Michel Trivi
075640c97d am 58cf88a5: 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 he
Merge commit '58cf88a5a91d82ae2fb3e23365eaa4524a9cd089' into eclair-mr2

* commit '58cf88a5a91d82ae2fb3e23365eaa4524a9cd089':
  Patch from HTC related to use of camcorder with wired headset plugged in:
2009-11-19 11:41:10 -08:00
Jean-Michel Trivi
e00f5f2bb9 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>
2009-11-18 19:32:44 -08:00
Jean-Michel Trivi
7d53bb2164 am 28306cf7: am f8d3aebe: Remove workaround introduced in 956f7ba5ee0f087c91b5fefd2718dae30f8c1e29 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).
Merge commit '28306cf74f6662f3dfa0748e6430b965427983cf' into eclair-mr2-plus-aosp

* commit '28306cf74f6662f3dfa0748e6430b965427983cf':
  Remove workaround introduced in 956f7ba5ee0f087c91b5fefd2718dae30f8c1e29
2009-11-16 14:39:02 -08:00
Eric Laurent
4102e0b5d0 am 0a210585: am 979de023: Fix issue 2245963: incoming call rings in ringtone-volume level through a wired headset is while listening to music.
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.
2009-11-16 14:38:59 -08:00
Jean-Michel Trivi
78028e9769 am f8d3aebe: Remove workaround introduced in 956f7ba5ee0f087c91b5fefd2718dae30f8c1e29 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).
Merge commit 'f8d3aebe4c19283eb34fb89e5932b3399d3bd753' into eclair-mr2

* commit 'f8d3aebe4c19283eb34fb89e5932b3399d3bd753':
  Remove workaround introduced in 956f7ba5ee0f087c91b5fefd2718dae30f8c1e29
2009-11-16 10:43:55 -08:00