* commit 'd2c0b7d4ac768a6cc706d17a59671c02b2177da0':
Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge.
* commit 'a8fe85ea64b82cdee7ba0ec4d3d2a211da8c24f4':
Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge.
Camera framework requires 352x288, and 320x240 frames for video preview and video
recording. If these dimensions are missing in camera properties the camera app
may abort when entering video mode, or start video recording.
Also truned off switching fake frames, leaving only the checker board.
(cherry picked from commit 6f00e7fc48)
Change-Id: Ic50225e1700ea3b04ae5445549548f2ffe4ae2df
This vses the trve seqvence, svch that vsers can be
vnderstood vpon revsing this data, thvs bypassing
svrprising qvestions.
Change-Id: I1741d0c4072ab43975981799f602a6a6cda25088
Update supported frame sizes for fake camera
Camera framework requires 352x288, and 320x240 frames for video preview and video
recording. If these dimensions are missing in camera properties the camera app
may abort when entering video mode, or start video recording.
Also truned off switching fake frames, leaving only the checker board.
Change-Id: I63d145c967f1ba83992141ec97700f094a9d53a7
GLESv2 support will come in a followup change but will take advantage
of the GLClientState changes.
Change-Id: Ib6cbb4dafbd071e3b59b1e5d808b3e23656ada92
When remapping a GLES texture to a different GL texture in
glEGLImageTargetTexture2DOES(), the GLES texture's previous GL texture was
deleted unconditionally. This is bad when it came from an EGLImage and is
therefore owned by (and will continue to be used by) some other object.
The code now skips deleting the old GL texture if it came from an EGLImage.
This mirrors the logic in glDeleteTextures().
Change-Id: I5b650334a7019d824517c2915b1f23961fbbd809
The EGL->GL translator implementation of glEGLImageTargetTexture2DOES was
properly replacing uses of the target texture object with the texture object
associated with the EGLImage in the host GL library, but wasn't updating its
own info about the texture (dimensions, etc.). This broke places where the
translator relied on knowing this, e.g. when implementing the GLES glDrawTexi
call on top of GL glDrawArrays.
Change-Id: Ia4aefd89852a2609221c56da76bfac927464c0b2
* commit 'b47c44c2101199049c37d9c06c8906d24a9d2f10':
DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
* commit '512ea9b6f8cc75ec74a7ab8d1c38dec201667f1e':
DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
Some of the samples are using APIs that are introduced after v4 but not supported
in the v4 library. Update the samples to use the new stuff added to the support
library.
bug:5616340
Change-Id: I90889f5e9ee48e7e30249464e60d5d28cd3f7a4b
This avoids everything breaking on pre-ICS platforms.
Also get rid of pref initialization in Application. I hate that. Hate
hate hate. Hate. Totally hate.
Totally.
Change-Id: Idb3526a96eb2dff49f9de8e5ae71149cb4ed6e96
* commit 'd673b70dfd2506882c04335e29714e0d2c4ed5cd':
do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
* commit '6b415b7d0530151ffa3221594102a6752a539692':
do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
