Merge commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f'
* commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '20db86042618e6ef422e28a9e328336b98d526b7'
* commit '20db86042618e6ef422e28a9e328336b98d526b7':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Merge commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43' into eclair-mr2-plus-aosp
* commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '0766b2d0f398dcad10e332b695bbc0cbe5011882' into eclair-mr2-plus-aosp
* commit '0766b2d0f398dcad10e332b695bbc0cbe5011882':
Update service example code.
Merge commit '259e3384face72ea8e30696d7bae492d37d44e8b' into eclair-mr2-plus-aosp
* commit '259e3384face72ea8e30696d7bae492d37d44e8b':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Merge commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99' into eclair-mr2-plus-aosp
* commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99':
remove an old STOPSHIP comment
Merge commit '1fbc280dac0ce5089ff1491612944344af8d72b4'
* commit '1fbc280dac0ce5089ff1491612944344af8d72b4':
Fix updating Bluetooth icon on status bar and for Wifi.
Adds support for formerly-unimplemented methods:
glCurrentPaletteMatrixOES
glLoadPaletteFromModelViewMatrixOES
glMatrixIndexPointerOES
glWeightPointerOES
The bulk of the changes are related to implementing the two PointerOES
methods, which are implemented pretty much the same way as the existing
Pointer methods were implemented.
This change also changes the way glPointSizePointerOES is implemented,
making it act like all the other Pointer methods. (Previously it was
not handling non-direct-buffer arguments correctly.)
Fixes bug 2308625 "Support matrix palette skinning
in JSR239 and related APIs"
Also updated GLLogWraper to fix two bugs in GLLogWrapper that were
discovered while testing matrix palette skinning support:
a) Handle trying to print the contents of null-but-enabled buffers.
(It's not legal to draw with null-but-enabled buffers, and
in fact some OpenGL drivers will crash if you try to render in this
state, but there's no reason the GLLogWrapper should crash while trying
to debug this situation.
b) Don't read off the end of a vertex buffer with non-zero position when
printing the entire contents of the vertex buffer. Now we only print from
the current position to the end of the buffer.
Merge commit '9c79938d47a3caa06e5fb956955374f30c55992b' into eclair-mr2
* commit '9c79938d47a3caa06e5fb956955374f30c55992b':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '0092ee13e4490bbd8de522d256fb4d7dab81be60'
* commit '0092ee13e4490bbd8de522d256fb4d7dab81be60':
Set InputType of WebTextView according to <input> field's type.
Merge commit '8657978aabc7141869926a98a0da257255678dd4'
* commit '8657978aabc7141869926a98a0da257255678dd4':
Expose onReceivedSslError() so that the WebView client
Merge commit '54f5ca4115b776eb5a1e04a4c014acccb916ef9c'
* commit '54f5ca4115b776eb5a1e04a4c014acccb916ef9c':
Add Java exceptions to catch RS calls with no context or no surface.
Merge commit '2109e6801199b10460330027f3537d406b6a0149'
* commit '2109e6801199b10460330027f3537d406b6a0149':
Fixing the build, only instantiate the software aac decoder in full stagefright builds.
Merge commit '81a005d070bec3a756f5caa48cdda25bcc732ce9'
* commit '81a005d070bec3a756f5caa48cdda25bcc732ce9':
Initial check in of stagefright software AAC decoder based on PV source code.
Merge commit 'a3d15d3b01146df40e72d67b79dd1f9368398f23'
* commit 'a3d15d3b01146df40e72d67b79dd1f9368398f23':
1) Capture the start memory before the test started
Merge commit 'f553a58425c66a990dbc5f4579c976a0636fc573'
* commit 'f553a58425c66a990dbc5f4579c976a0636fc573':
Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
Merge commit '44e537a859966378f1599db5e5d41045e78efd94'
* commit '44e537a859966378f1599db5e5d41045e78efd94':
Improves the touch-based text selection UI in text boxes.
Merge commit '0c15b889317e9569282e4513db598369a0506b40'
* commit '0c15b889317e9569282e4513db598369a0506b40':
Revert "When using MDP, we needed to use a texture for diming."
Merge commit '7e90005fcb95d4c20c92e915f4418b94341dda36' into eclair-mr2
* commit '7e90005fcb95d4c20c92e915f4418b94341dda36':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2
* commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
remove an old STOPSHIP comment
Merge commit 'b08170ad7e4ca4908852b0e20759ea740b338a03' into eclair-mr2-plus-aosp
* commit 'b08170ad7e4ca4908852b0e20759ea740b338a03':
Add API to get Active Sinks.
Merge commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff' into eclair-mr2
* commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff':
Add API to get Active Sinks.
Merge commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3' into eclair-mr2-plus-aosp
* commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3':
DO NOT MERGE Reverting change I53e91db7.
Merge commit '47cc8112c3f77637ef408ef18e48d146e8250a27' into eclair-mr2-plus-aosp
* commit '47cc8112c3f77637ef408ef18e48d146e8250a27':
Fix updating Bluetooth icon on status bar and for Wifi.
Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-mr2
* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
DO NOT MERGE Reverting change I53e91db7.
Merge commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-mr2
* commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
Fix updating Bluetooth icon on status bar and for Wifi.
