Merge commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0' into froyo-plus-aosp
* commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0':
Make sure when WebView modified mScrollX/Y directly,
Merge commit '128f1a87c55a291109ce521a92308c186e5d2db5' into kraken
* commit '128f1a87c55a291109ce521a92308c186e5d2db5':
Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
Merge commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a' into froyo-plus-aosp
* commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a':
Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
onScrollChanged() is called so that the View system
can do what it needs to adjust.
As WebView's onScrollChanged will call sendOurVisibleRect(),
we don't need to call it explicitly any more.
Fix http://b/issue?id=2438457
Merge commit '0f7c543cc48d287591b5638a15bf8ca977e162a2' into kraken
* commit '0f7c543cc48d287591b5638a15bf8ca977e162a2':
Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
Look for corrupted bytes and replace with ?
If the problem is in the parsing code, then this will not help.
Change-Id: If33643f126a4099d4113e37760c6ef74683fe97e
Merge commit 'eb6e3edc0f21c5c8a574f8086f9622c44c0ff866' into froyo-plus-aosp
* commit 'eb6e3edc0f21c5c8a574f8086f9622c44c0ff866':
Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
Merge commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b' into kraken
* commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b':
Unhiding TTS API constants and methods needed for TTS plugin support.
Merge commit '6df44727d06548015e741dd8f63716602ed1e5d1' into froyo-plus-aosp
* commit '6df44727d06548015e741dd8f63716602ed1e5d1':
Unhiding TTS API constants and methods needed for TTS plugin support.
Merge commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d' into kraken
* commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d':
Add a new intent category used for activities running in carmode.
Merge commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp
* commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4':
Add a new intent category used for activities running in carmode.
Merge commit '90bd943364af8af8e3409f3fffe409f724a4210b' into kraken
* commit '90bd943364af8af8e3409f3fffe409f724a4210b':
Dont start wifi if in airplane mode
Merge commit '9c50996b175a1ee4b0069cba5163310c0189ac36' into froyo-plus-aosp
* commit '9c50996b175a1ee4b0069cba5163310c0189ac36':
Dont start wifi if in airplane mode
Now that wifi start is asynchronous
at the time of bring up, make sure
Wifi is not started if in airplane
mode.
Bug: 2567652
Change-Id: I947b7c8480029973bcbf028f6143aabbc88c9793
Merge commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad' into kraken
* commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad':
Support another kind of iso mpeg4 file.
Merge commit '29039deea99a5529d92f7add3f9077ab247d3acd' into froyo-plus-aosp
* commit '29039deea99a5529d92f7add3f9077ab247d3acd':
Support another kind of iso mpeg4 file.
Merge commit '3667b9b471a6585d22106cbfe4a04111ca86643c' into kraken
* commit '3667b9b471a6585d22106cbfe4a04111ca86643c':
revert the stripping of System Group:
Merge commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e' into froyo-plus-aosp
* commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e':
Make desk mode work again.
Merge commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf' into froyo-plus-aosp
* commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf':
revert the stripping of System Group:
Merge commit 'f5071884809219edb420a4f7c4a0eef9523d7bca' into kraken
* commit 'f5071884809219edb420a4f7c4a0eef9523d7bca':
Add test annotations to frameworks common tests.
Merge commit 'c1548e3819ab4662e6b5f5455f95258b37dc7192' into froyo-plus-aosp
* commit 'c1548e3819ab4662e6b5f5455f95258b37dc7192':
Add test annotations to frameworks common tests.
Allow the user to start scrolling back into content immediately
after dragging past the end of content.
Remove some dead code.
Change-Id: Ife8f60499ac58179ba1e2500ca8745916392a4bc
Merge commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4' into kraken
* commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4':
Instead of holding an ApplicationContext, JWebCoreJavaBridge
Merge commit '61c3a13e5f9d20c621f49598a0082063404c5f7e' into froyo-plus-aosp
* commit '61c3a13e5f9d20c621f49598a0082063404c5f7e':
Instead of holding an ApplicationContext, JWebCoreJavaBridge
Merge commit '28525488fb5769fb119b01db17dc0ed305f0e7b0' into kraken
* commit '28525488fb5769fb119b01db17dc0ed305f0e7b0':
Fix bug 2565463 Ensure an object cannot appear twice in the
Merge commit '6c8770df939782d767fdf2cdb68c4a289015a5e6' into kraken
* commit '6c8770df939782d767fdf2cdb68c4a289015a5e6':
Use local lock for most MediaMetadataRetriever methods. Bug 2560834.
Merge commit '9ab05fff41e983c9b3175096c320aefced81276b' into froyo-plus-aosp
* commit '9ab05fff41e983c9b3175096c320aefced81276b':
Fix bug 2565463 Ensure an object cannot appear twice in the
Merge commit 'd9c16c37ea28933973f32cb434f770226266b675' into froyo-plus-aosp
* commit 'd9c16c37ea28933973f32cb434f770226266b675':
Use local lock for most MediaMetadataRetriever methods. Bug 2560834.