Merge commit '1441bdfc19d6998607adf1347ed8dafc102908c9' into gingerbread-plus-aosp
* commit '1441bdfc19d6998607adf1347ed8dafc102908c9':
Use the target color format from the camera source if possible
Simplified locking scheme in Proxy's getProxy(..) method.
Also modified ContentObserver creation to be done from any thread.
Change-Id: I54edb56a86796f08a1310cf1ae1d1f0c42a0cbc8
Bluetooth stress tests include stress tests for enabling/disabling bluetooth,
making the device discoverable/undiscoverable, and starting and stopping scans.
Change-Id: Ic8ba09475ffe5551717438673e0ed3f4bd17cf2f
Merge commit '41b29cb0a8e04e553357662b81bffea26f1c2d84'
* commit '41b29cb0a8e04e553357662b81bffea26f1c2d84':
Fix an issue where the track duration does not include the last sample duration
- If the target color format is unavailable, the default
platform-dependent color format will be used.
- Also add some logic to prevent looping forever if the
omx component is buggy supporting color format enumeration.
Change-Id: I119a78f0d6201b4c3621235cca2f523ec14e24e3
Check for the validity of the attrs_list in eglChooseConfig before using
it. This avoids a crash during tests in which the attributes are NULL.
Change-Id: I1c0a46b505ae919e2454cfdce32f8dfc21ead247
ClipboardManager was in android.text(!!) so it needed to be moved
up to android.content to have access to the richer data types we
now need.
ClippedData is the data representation. Still needs a lot of
fleshing out to allow holding more than one data type at a time
and perhaps conversions between them. (MIME-oriented interrogation
and conversion will be done through ContentProvider, which needs
to grow an ability to report multiple MIME types and accept a
desired MIME type when a stream is being opened.)
Change-Id: Ifa51bedcd084a677813b255d171804e8496b0cb5
Merge commit '870678a954e1e2a96caf76453c20de808253ffd1'
* commit '870678a954e1e2a96caf76453c20de808253ffd1':
Better support for fake timestamps in RTP, H.263 video now also requests FIR.
Merge commit '2405988fa07dfc7f6607cafe75322326628a9f52'
* commit '2405988fa07dfc7f6607cafe75322326628a9f52':
A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
Merge commit 'c6d1519e549740abd56df7a98b5348bd9095ae46'
* commit 'c6d1519e549740abd56df7a98b5348bd9095ae46':
Specification of codec specific data as part of the session description is now optional.
Merge commit 'd6dc45c30c1704fca9ec33f51c7c4ec1bee515ea'
* commit 'd6dc45c30c1704fca9ec33f51c7c4ec1bee515ea':
Failure to move .dex in eng builds is not fatal
Merge commit 'ac8e7060e09cc8eecc3f959691185bf156939404'
* commit 'ac8e7060e09cc8eecc3f959691185bf156939404':
Don't return a decoder error if the encoded stream does not start with SPS/PPS.
Merge commit '1f513d8821670a33d6361ea521b6756163a3f9bf'
* commit '1f513d8821670a33d6361ea521b6756163a3f9bf':
Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
Merge commit '3aad8c38520956708e51882f3fad63a7a217e8e4' into gingerbread-plus-aosp
* commit '3aad8c38520956708e51882f3fad63a7a217e8e4':
Fix an issue where the track duration does not include the last sample duration
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp
* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
Tracking merge of dalvik-dev to gingerbread
