Merge commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a' into froyo-plus-aosp
* commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a':
Fix for bug 2558156: Encodig is null
Merge commit '461cef5d209fd072c82f6a70eb106e4690b7ef97' into froyo-plus-aosp
* commit '461cef5d209fd072c82f6a70eb106e4690b7ef97':
As we don't support over scroll any more, we need
Merge commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982' into froyo-plus-aosp
* commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982':
Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
Merge commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256' into froyo-plus-aosp
* commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256':
Fix issue #2560791: Expose API to go in to car mode.
Merge commit 'de1b1872b33495da0bcd4c29ffeb3783fa7702e9' into froyo-plus-aosp
* commit 'de1b1872b33495da0bcd4c29ffeb3783fa7702e9':
Test connecitvity manager functionality in state change.
Merge commit '3a0d1d11eba05d74d0461083eb6f31321588a0f6' into froyo-plus-aosp
* commit '3a0d1d11eba05d74d0461083eb6f31321588a0f6':
Fix crash while turning bluetooth on, due to a race condition.
Merge commit '058e385b8bca0376c27a24a54f3b00777ef30e0a' into froyo-plus-aosp
* commit '058e385b8bca0376c27a24a54f3b00777ef30e0a':
doc change: fix link in guidelines index.
Merge commit 'c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc' into froyo-plus-aosp
* commit 'c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc':
Fix alarms with negative or very large wakup times.
The problem is a bug in AudioFlinger::MixerThread::prepareTracks_l() that makes that even if the TrackHandle
is destroyed, the corresponding Track will remain active as long as frames are ready for mixing.
If the track uses shared memory (static mode) and the sound is looped, this track will play for ever.
The fix consists in removing the track from active list immediately if the track is terminated.
Change-Id: I4582aa1d981079ab79be442fb6185f5afaed5cf3
Merge commit '804878f3a3ea40ace5bd572cee98f9e13a0dbf0b' into froyo-plus-aosp
* commit '804878f3a3ea40ace5bd572cee98f9e13a0dbf0b':
Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.
Merge commit 'e259bc770b3eeb88eb7a03ec0af2522ca9929f58' into froyo-plus-aosp
* commit 'e259bc770b3eeb88eb7a03ec0af2522ca9929f58':
Fix issue #2558391: Package manager problem when not replacing existing system partition app
Merge commit '9b9a89a58f50c3004959c36252489fae54fb9c58' into froyo-plus-aosp
* commit '9b9a89a58f50c3004959c36252489fae54fb9c58':
added a cleanspec since ActiveSyncInfo.aidl was removed
Merge commit '9253446922d925f6a5453b60d539beed292921a7' into froyo-plus-aosp
* commit '9253446922d925f6a5453b60d539beed292921a7':
Use case insensitive matching.
Merge commit '5c1e96bbc7f71fc3512706af878599fdfbdb7690' into froyo-plus-aosp
* commit '5c1e96bbc7f71fc3512706af878599fdfbdb7690':
Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).
Merge commit '11a7ba367f39175f41300f384ec6e984bcc08d53' into froyo-plus-aosp
* commit '11a7ba367f39175f41300f384ec6e984bcc08d53':
Support for apps search in apps provider contract
Merge commit '07330791116513710d879c45b2f095cd314cbfd0' into froyo-plus-aosp
* commit '07330791116513710d879c45b2f095cd314cbfd0':
Show SD unavailable icon for apps on SD when ejected.
Merge commit '544592e14f8d7643238e40ba9879727497900f35' into froyo-plus-aosp
* commit '544592e14f8d7643238e40ba9879727497900f35':
fix [2542425] memory leak during video recording
[Sorted|Keyed]Vector<TYPE> would leak their whole storage when resized
from the end and TYPE had trivial dtor and copy operators.
Change-Id: I8555bb1aa0863df72de27d67ae50e20706e90cf5
