Merge commit 'f97dec837c1fa47250af023bbaea0566a0ec9695'
* commit 'f97dec837c1fa47250af023bbaea0566a0ec9695':
Fixed the H263 video duation which caused the incorrect video validation.
Merge commit '687545fc9ee79124229152df1236c53ba7d71215'
* commit '687545fc9ee79124229152df1236c53ba7d71215':
Run the metadataretriever at background priority. Bug 2187133.
Merge commit '7373755ac391468c413f8ce4ba1f1bcc60bb1674'
* commit '7373755ac391468c413f8ce4ba1f1bcc60bb1674':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
Merge commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4'
* commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4':
Add Authentication Type field to the APN settings.
Merge commit '84b0d236a307915d3de8ffeb6fad1d8b89cd8d16'
* commit '84b0d236a307915d3de8ffeb6fad1d8b89cd8d16':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '20fcfac829f4919157bd986cdae29f27669f99dc'
* commit '20fcfac829f4919157bd986cdae29f27669f99dc':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit 'b1a8f54bf62c3974831bf3c866275425127cf7b6'
* commit 'b1a8f54bf62c3974831bf3c866275425127cf7b6':
Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
Merge commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63' into eclair-mr2-plus-aosp
* commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63':
Fixed the H263 video duation which caused the incorrect video validation.
Merge commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b' into eclair-mr2-plus-aosp
* commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b':
Run the metadataretriever at background priority. Bug 2187133.
Merge commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed' into eclair-mr2-plus-aosp
* commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2
* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
Fixed the H263 video duation which caused the incorrect video validation.
Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-mr2
* commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85':
Run the metadataretriever at background priority. Bug 2187133.
Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-mr2
* commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
Merge commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2' into eclair-mr2-plus-aosp
* commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2':
Add Authentication Type field to the APN settings.
Merge commit 'ed7755cc30fe6b2b0254207347629ad0cae094db' into eclair-mr2-plus-aosp
* commit 'ed7755cc30fe6b2b0254207347629ad0cae094db':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '34180d328c57a6a38bc85651fda0e69890ad7a9b' into eclair-mr2-plus-aosp
* commit '34180d328c57a6a38bc85651fda0e69890ad7a9b':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit '6158038a09069bc178970160d4b3667573bfc655' into eclair-mr2
* commit '6158038a09069bc178970160d4b3667573bfc655':
Add Authentication Type field to the APN settings.
Merge commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372' into eclair-mr2
* commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit 'a47d153647d8750b667942ad80e7b905ea98c68b' into eclair-mr2
* commit 'a47d153647d8750b667942ad80e7b905ea98c68b':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit '27123468b33cb61a1600079d583302b1b078b2ee' into eclair-mr2-plus-aosp
* commit '27123468b33cb61a1600079d583302b1b078b2ee':
Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
Merge commit '6ba3ef31fd4672df3fb886ff458329d0d15b8456'
* commit '6ba3ef31fd4672df3fb886ff458329d0d15b8456':
Many fixes to text input in the browser, particularly when moving to a new field.
Merge commit 'bb107bd6f7981cd2b2e31a0afc6f6bf2a6d5118f' into eclair-mr2-plus-aosp
* commit 'bb107bd6f7981cd2b2e31a0afc6f6bf2a6d5118f':
Many fixes to text input in the browser, particularly when moving to a new field.
Remove many instances where we are setting selection unnecessarily. Instead, only
set the selection due to a click, touch, or inserting a character. A touch will
now set the selection properly, rather than at the beginning/end, fixing
http://b/issue?id=1650395 Also fixes http://b/issue?id=2208188
Requires a change to external/webkit.
Previously we were keeping our own state in the UI thread to
determine when to send events to the plugin. This change removes
that logic and uses the document focus to determine when events
are to be sent. This also fixes problems with the plugins
occasionally not receiving lose focus events.
see bug http://b/2033843
Explicitly draw the region and pointer from java.
Set up the starting selection criteria from both hard keyboard
and menu 'Select Text'.
Add invalidate() to show transition from arrow to ibeam
immediately, and to dismiss copy region immediately.
partially fixes http://b/issue?id=1667690
Merge commit 'fdde959c22b5758db15293bc442e01674727fa61'
* commit 'fdde959c22b5758db15293bc442e01674727fa61':
When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
Merge commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1' into eclair-mr2-plus-aosp
* commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1':
When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
