Merge commit 'eb3af645781d858eea3bccfe193411e23474e11d'
* commit 'eb3af645781d858eea3bccfe193411e23474e11d':
Use the media.enable1026 system property to indicate whether the
Merge commit '9ffa86825c57c8bf82669b438bd0e8feb865d4b7' into eclair-plus-aosp
* commit '9ffa86825c57c8bf82669b438bd0e8feb865d4b7':
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.
this gralloc module is only used on msm7k and doesn't need
synchronization in lock/unlock because we don't allow EGLImageKHR
with the GPU renderer on this platform.
hopefully this will remove some of the confusion about how gralloc
should be implemented.
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.
Merge commit '57d3b3680a6d37ffe04e1f24be25b4907bcbaa20'
* commit '57d3b3680a6d37ffe04e1f24be25b4907bcbaa20':
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
Merge commit '2754389d0e7638b3065ecb3c965b1f262d2205ed' into eclair-mr2
* commit '2754389d0e7638b3065ecb3c965b1f262d2205ed':
gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '3909820584e35b696f8387bda4313fb417cd8ab0'
* commit '3909820584e35b696f8387bda4313fb417cd8ab0':
Fix bug 2111240 When docked to a BT dock, give priority to wired
Merge commit '259ede35b4d8d50d0394624780733e4c061fbe7e' into eclair-mr2-plus-aosp
* commit '259ede35b4d8d50d0394624780733e4c061fbe7e':
Fix bug 2111240 When docked to a BT dock, give priority to wired
Merge commit '9df12adc2ff87eef733b948255f2960ca070981a' into eclair-mr2
* commit '9df12adc2ff87eef733b948255f2960ca070981a':
Fix bug 2111240 When docked to a BT dock, give priority to wired
Merge commit '2754389d0e7638b3065ecb3c965b1f262d2205ed' into eclair-plus-aosp
* commit '2754389d0e7638b3065ecb3c965b1f262d2205ed':
gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '9df12adc2ff87eef733b948255f2960ca070981a' into eclair-plus-aosp
* commit '9df12adc2ff87eef733b948255f2960ca070981a':
Fix bug 2111240 When docked to a BT dock, give priority to wired
Merge commit '4842a5eaee0b93950297f52dd1ce56d13f7628eb'
* commit '4842a5eaee0b93950297f52dd1ce56d13f7628eb':
gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
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.
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.
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.
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().
Merge commit '288cb24be01d065843a2a98ed6c0fdbb5faa8268' into eclair-mr2-plus-aosp
* commit '288cb24be01d065843a2a98ed6c0fdbb5faa8268':
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
Merge commit 'dc80f522f23ecda902bf8ddf5de68d6fe10e2c05' into eclair-mr2
* commit 'dc80f522f23ecda902bf8ddf5de68d6fe10e2c05':
gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
Merge commit '7422163dfcbad4997d30274bb7c438997269ae4d' into eclair-mr2-plus-aosp
* commit '7422163dfcbad4997d30274bb7c438997269ae4d':
gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
Merge commit 'dc8efbf8be019fa34e9b83039cf4b5b070f3ae28' into eclair-mr2-plus-aosp
* commit 'dc8efbf8be019fa34e9b83039cf4b5b070f3ae28':
Fix issue 2304701: Media streams can remain muted on A2DP output.
Merge commit 'c3f00492488dec0b8eaa5d28aac1bcc8ca899a3c' into eclair-plus-aosp
* commit 'c3f00492488dec0b8eaa5d28aac1bcc8ca899a3c':
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
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>
Merge commit 'cda6ed314ac73ffaeb0350056c84fc0d8b7b58ea' into eclair-mr2
* commit 'cda6ed314ac73ffaeb0350056c84fc0d8b7b58ea':
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.
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.
Merge commit '9f879fb0625bbbc117f5d6ce94451204f5fe8f04'
* commit '9f879fb0625bbbc117f5d6ce94451204f5fe8f04':
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
Merge commit '49a5c99a84626b5b1db4eda5239307e3366e28fa' into eclair-mr2
* commit '49a5c99a84626b5b1db4eda5239307e3366e28fa':
libgralloc-qsd8k: Do not use the physical address of surfaces/framebuffer
