Merge commit '06ff27f0cb9eeb53fd35233a30ef5cc5e5586d83'
* commit '06ff27f0cb9eeb53fd35233a30ef5cc5e5586d83':
Add the HTML5Audio class, to support the audio tag.
Merge commit '8f1e7b62d87b6e2f5fbc9609baf1dea7873218ce' into gingerbread-plus-aosp
* commit '8f1e7b62d87b6e2f5fbc9609baf1dea7873218ce':
Cleanspec to fix incremental build failures of the form:
Merge commit '5d5a9db514a9cf42fbc189fc3af6da602d89b747' into gingerbread-plus-aosp
* commit '5d5a9db514a9cf42fbc189fc3af6da602d89b747':
GPS: Enable some more logging
Merge commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5' into gingerbread-plus-aosp
* commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5':
Fix bug where home presses were not poking user activity.
Merge commit 'd68cda472a3646966a203338ccac04f0783293b7' into gingerbread-plus-aosp
* commit 'd68cda472a3646966a203338ccac04f0783293b7':
An attempt to unregister a handler that's no longer registered should not cause an assertion.
We now poke user activity twice: once upon dequeueing an event
for dispatch and then again just before we dispatch it. The second
poke is to compensate for the fact that it can take a few seconds to
identify the dispatch target (if the application is responding slowly)
but we want to keep the display from going to sleep for X amount of time
after the app gets a chance to actually receive the event. This mirrors
pre-Gingerbread behavior.
Removed some unnecessary code that filters user activity pokes when sending
events to KeyGuard. We don't need this because KeyGuard already tells the
power manager to disable user activity.
Bug: 3101397
Change-Id: I8c3a77601fdef8f584e84cfdd11aa79da0ff51db
Merge commit '72a635a1e08c1fe316dd91786774677abb11aafa' into gingerbread-plus-aosp
* commit '72a635a1e08c1fe316dd91786774677abb11aafa':
DO NOT MERGE Add additional options and receiver to BT tests
Merge commit '382717f3eeca1a21e9756c7de42b4d31747d1675' into gingerbread-plus-aosp
* commit '382717f3eeca1a21e9756c7de42b4d31747d1675':
Set the thread pool size of NIST sip stack to one.
Merge commit 'a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42' into gingerbread-plus-aosp
* commit 'a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42':
Pressing the power button quickly needs to turn the screen on and off correctly.
Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp
* commit '1f90908c19ab24791bd54c856b32bb12682496eb':
Prevent use of NFC api if device is not featurized for NFC.
Merge commit 'bc96c2848dadaa844f95e89708d9941f73bbf400' into gingerbread-plus-aosp
* commit 'bc96c2848dadaa844f95e89708d9941f73bbf400':
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 '004f968d0cf60c08d7b393129ed2d6e4304041e5' into gingerbread-plus-aosp
* commit '004f968d0cf60c08d7b393129ed2d6e4304041e5':
Link against the static libcrypto in external/openssl.
Merge commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823' into gingerbread-plus-aosp
* commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823':
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.
