Merge commit 'd98d0fc6e9172d3f130794e499462c911920adf6' into gingerbread-plus-aosp
* commit 'd98d0fc6e9172d3f130794e499462c911920adf6':
Optimize VelocityTracker to run in linear time.
Merge commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7' into gingerbread-plus-aosp
* commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7':
Sort the IME list before showing to user
Merge commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf' into gingerbread-plus-aosp
* commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf':
improve a bit the implementation of eglGetProcAddress
Merge commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48' into gingerbread-plus-aosp
* commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
Merge commit '605f402796afa9c88e2f91284e98d1f59a0726aa' into gingerbread-plus-aosp
* commit '605f402796afa9c88e2f91284e98d1f59a0726aa':
Import revised translations. DO NOT MERGE
Merge commit '235be391f3b9cd79e525de87757e361ae044940d' into gingerbread-plus-aosp
* commit '235be391f3b9cd79e525de87757e361ae044940d':
Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
The email-based subscribe links for the Android Developer forums do
not work for two groups (android-discuss, android-beginners) due to
recent changes in those groups. These links need to be changed to
HTML-based subscribe links instead.
For consistency, other links are being changed to use the HTML-based
subscription mechanism as well.
Internal Bug: 2908002
Change-Id: I601b959935584270d6107c4600b28ac5f51359e1
Merge commit '532d2ac5d5c06c3938c4999238d1051207bfe53c' into gingerbread-plus-aosp
* commit '532d2ac5d5c06c3938c4999238d1051207bfe53c':
Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
o Assume there is only a single output buffer containing such information.
This simplifies the logic in MP4 file writer
o Output SPS and PPS in the very first buffer for software AVC encoder
This is to make AVC encoder work with the MP4 file writer
o Add timestamp value for codec config data
Change-Id: Iad27a04579e6028332429cd0bebd30976041e997
Merge commit '259b4c860212dd528b25d1cce6e74be01afed85c' into gingerbread-plus-aosp
* commit '259b4c860212dd528b25d1cce6e74be01afed85c':
SIP: clean up unused class and fields.
Merge commit '745d1e905886ed0d8fa0a8590463093d125bc53a' into gingerbread-plus-aosp
* commit '745d1e905886ed0d8fa0a8590463093d125bc53a':
Update javadoc for the API and change return of getBondedDevices().
Merge commit '63cca69157eae17da2a5492d1bcb7330061a52ac' into gingerbread-plus-aosp
* commit '63cca69157eae17da2a5492d1bcb7330061a52ac':
Make sure profiling is done only for views that are actually measured, laid out and drawn.
Merge commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b' into gingerbread-plus-aosp
* commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b':
Fix bug 2684341 Don't steal the media button event from the phone
Merge commit 'cbaef51847ab8d8c4d039f0e425d434811f77f0d' into gingerbread-plus-aosp
* commit 'cbaef51847ab8d8c4d039f0e425d434811f77f0d':
Check whether Bluetooth is enabled before making any API calls.
Merge commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f' into gingerbread-plus-aosp
* commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f':
Support multiple PPS and SPS in avcC box
Merge commit '4edf85abc919b7d0e8db71c0c6166c7994269830' into gingerbread-plus-aosp
* commit '4edf85abc919b7d0e8db71c0c6166c7994269830':
Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
Merge commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0' into gingerbread-plus-aosp
* commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0':
Added tests for audio effects in MediaFrameworkTest
After UMS mounted, isUsbMassStorageConnected() will always return true even if USB is disconnected.
It's because mUmsEnabling will always be ture.
Change-Id: Ib24b2359ea2684eb0a9faeb880f383e87630e6e1
Uses a linked list for efficient pointer addition and removal.
When possible, makes use of the fact that pointer ids are usually in
sorted order to avoid quadratic time lookups when adding new data.
Fixed an incorrect assumption that the pointer count would always change
when old pointers were removed.
Also fixed a bug in InputQueue FinishedCallback recycling.
Change-Id: Ie048d3bb022d39cf4185e2fe43923a861d94c4f3