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
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>
Merge commit 'a0737122a3822b81382c7b44a3279fefb62eb991'
* commit 'a0737122a3822b81382c7b44a3279fefb62eb991':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Merge commit '8c2b7b65f3f78181a5b04933f54a56b8eb6884d5' into eclair-mr2-plus-aosp
* commit '8c2b7b65f3f78181a5b04933f54a56b8eb6884d5':
Patch from HTC: changes in libaudio
Merge commit '44f72974bfba0821f5080617b23f8706b86592b1' into eclair-mr2-plus-aosp
* commit '44f72974bfba0821f5080617b23f8706b86592b1':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Merge commit 'fea8b9e5641e1bdf8498b39cf108971c6fd130f8' into eclair-mr2
* commit 'fea8b9e5641e1bdf8498b39cf108971c6fd130f8':
Patch from HTC: changes in libaudio
Merge commit '0a6561450eddb6b13f56392fb116d6ed2ef3694f' into eclair-mr2
* commit '0a6561450eddb6b13f56392fb116d6ed2ef3694f':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
* 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.
- 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.
Merge commit '83fb1ada26d894c807686a93925c1e255fddb28c' into eclair-mr2-plus-aosp
* commit '83fb1ada26d894c807686a93925c1e255fddb28c':
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
Merge commit '3aac38efbe348faeb3149b2ec7141b3dc9e939ae'
* commit '3aac38efbe348faeb3149b2ec7141b3dc9e939ae':
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.
Merge commit '8a5a107a014f94e6335b88f1942c82d23ceb6b04' into eclair-mr2
* commit '8a5a107a014f94e6335b88f1942c82d23ceb6b04':
Improvement for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes.
Merge commit 'e6bb8325b55cc1087d84004166a97d2b9bef98bb'
* commit 'e6bb8325b55cc1087d84004166a97d2b9bef98bb':
Patch from HTC related to use of camcorder with wired headset plugged in:
Merge commit '0fd7c5be0e7e7f1013617ed2da24941c596a2137' into eclair-mr2-plus-aosp
* commit '0fd7c5be0e7e7f1013617ed2da24941c596a2137':
Patch from HTC related to use of camcorder with wired headset plugged in:
Merge commit '58cf88a5a91d82ae2fb3e23365eaa4524a9cd089' into eclair-mr2
* commit '58cf88a5a91d82ae2fb3e23365eaa4524a9cd089':
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>
Merge commit '3008e8f5b947d7b7f88427dcf54f11e800d007df'
* commit '3008e8f5b947d7b7f88427dcf54f11e800d007df':
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.
Merge commit '979de023050ebe82680c665259fc833b0a17d3f5' into eclair-mr2
* commit '979de023050ebe82680c665259fc833b0a17d3f5':
Fix issue 2245963: incoming call rings in ringtone-volume level through a wired headset is while listening to music.
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).
When the ringtone is not looped (non factory ringtone), a new AudioTrack is started every time the ringtone is repeated. The second time the track is started, the condition that triggers volume limitation is not true any more as music has been stopped for more than SONIFICATION_HEADSET_MUSIC_DELAY seconds and ringtone volume is not limited.
The fix consists in checking the condition (music playing or stopped for less than SONIFICATION_HEADSET_MUSIC_DELAY) when entering ringtone mode and latch it until we exit ringtone mode.
Merge commit 'bcd5273d6aa77cc961261202c8c9eee950ddc8b7' into eclair-mr2-plus-aosp
* commit 'bcd5273d6aa77cc961261202c8c9eee950ddc8b7':
should help [2223746] qsd8k MDP locks up, logs show copyBits failed (Connection timed out) in Passion camera zoom level 1
