Merge commit '3e9bcb98c4190b18d113e79ead071a86cd7ca480'
* commit '3e9bcb98c4190b18d113e79ead071a86cd7ca480':
Set the thread pool size of NIST sip stack to one.
Merge commit '5747eebf6eb5ea91480dc576c45c752685383e37'
* commit '5747eebf6eb5ea91480dc576c45c752685383e37':
Pressing the power button quickly needs to turn the screen on and off correctly.
Merge commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8'
* commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8':
Prevent use of NFC api if device is not featurized for NFC.
Merge commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2'
* commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2':
For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
Merge commit 'ec62719c8396997b436c44906c2760e3914698b8'
* commit 'ec62719c8396997b436c44906c2760e3914698b8':
Link against the static libcrypto in external/openssl.
Merge commit '8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17'
* commit '8f5214eb6fa6c85c9c6703da15c4a6cf95ac4b17':
If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
Merge commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f' into gingerbread-plus-aosp
* commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f':
Fix some camera orientation javadoc errors.
This fails beacsue the result of the test is so large that DRT suffers
OOM when reading the result. This will be fixed when we switch to
DRT2. Skipping for now to keep the crashes at zero.
Also fixes bug numbers for other skipped tests
Bug: 2697589
Change-Id: I897ff1f0a2941d305af5fb1c8de8f6690365fb9e
Merge commit 'b4116c09fb9784551911ea0a10b4dd321ff9aa7d' into gingerbread-plus-aosp
* commit 'b4116c09fb9784551911ea0a10b4dd321ff9aa7d':
Fix the incorrect environment variable name for the thread pool size.
This is a way to supply any amount of arbitrary initial
values for the newly created contacts or additional
data for an existing contact.
Change-Id: Iec050cf9177be2ffb115e473dcd43ef37e5bbd5e
Implemented constructor using a byte array to parse.
Added missing exception in method declaration, leading to update api/current.xml
Change-Id: I2660484aef1225e90c2f32a572041a2c3aecf288
Merge commit '453c6d449b6469dde9aae6044dedfe3be0da76c5' into gingerbread-plus-aosp
* commit '453c6d449b6469dde9aae6044dedfe3be0da76c5':
add api level 9 'since' flag to docs
Useful for tweaking touch screen alignment without having to modify the
kernel device driver x/y axis bounds.
Change-Id: I6ca43d3c138548f9dfb76aa33150a0c853698fb6
Merge commit 'b4157a432cf791906d5b2f6d187f1767357a51bb' into gingerbread-plus-aosp
* commit 'b4157a432cf791906d5b2f6d187f1767357a51bb':
StrictMode: fix docs to actually compile and add a utility method.
Merge commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6' into gingerbread-plus-aosp
* commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6':
Don't force ended when full screen video is returned manually.
Apps that existed in an ASEC container before we put native libraries
in the ASEC container will have their native libraries in the
/data/data/<app>/lib directory. Don't try to symlink to the ASEC
container's library directory in this case.
Bug: 3108230
Change-Id: I32167341cc8ff8c005e50f456ee7c783bfb0bf22
Merge commit '06ff27f0cb9eeb53fd35233a30ef5cc5e5586d83'
* commit '06ff27f0cb9eeb53fd35233a30ef5cc5e5586d83':
Add the HTML5Audio class, to support the audio tag.
Yes, this is a last minute public API change, but I'm already getting
a lot of inquiries about how to use StrictMode on a GB device but
targetting Eclair or Froyo. I'd like a simple answer involving
reflection, but the current API is too painful to use via reflection.
I imagine this will be a common request, and it's much easier for us
to write a little blog post about trying it out if there's an easy way
to use it with reflection.
Change-Id: I1f21aaac7e61e5e90d1e4facc0c787d8daf089b1
