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.
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
getBondedDevices() *might* work if called before the Bluetooth
State intent is broadcasted. However, this can cause ANRs and problems.
This API was updated to return null, if called before the intent
is received. However, this might cause existing apps to crash. Return
an empty set instead.
Change-Id: Ibc484d3394aa0bbebd651221efde6a7015ce7110
For example, Settings app makes calls to get Bonded Devices
before Bluetooth is on. This leads to ANRs and will
prevent autoconnection.
Change-Id: I56748a9bd1d603b5782c17775c6b20b831bf6572
- Also
o do not use the hard-coded profile and levels.
Instead, we are using the profile and level found in the codec config data
o we are not supporting FRExt profile and levels for now, which requires
additional seq parameter set extension for instance.
Change-Id: If695b4c996d073d8e48aa45fdd7001e9f016f375
app is the phone is ringing, even in silent mode.
Use the PhoneStateListener to know whether the phone is ringing,
as the mode is not MODE_RINGTONE when ringing in silent mode.
Change-Id: Iede350cecde0b663d50f9b4a57f9a9ef08066c0d
