Merge commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0' into kraken
* commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0':
Replaced raw string arguments for Context.getSystemService() with final Context variables
Merge commit '847b82d8a6d3cc6969cbeeaf9ca7e879abab482a' into kraken
* commit '847b82d8a6d3cc6969cbeeaf9ca7e879abab482a':
Add more error checking for ndc
Merge commit '89bc1395748a0a139db82adbf01166ed6fa79766' into froyo-plus-aosp
* commit '89bc1395748a0a139db82adbf01166ed6fa79766': (392 commits)
Add more error checking for ndc
Add javadoc for camera scene modes.
more clean-up in preparation of bigger changes
Fix a typo in Singleton<>
Avoid copying for input recording frames in CameraSource
Add video frame parameter.
more clean-up of Surfaceflinger's client management
Better sniffing of MPEG4 content by checking for a compatible sub-brand.
Remove the logic in CameraSource using CameraParameters class to find out the buffer size.
Add support for gps altitude EXIF tags.
minor clean-up GLclampx -> GLclampf
clean-up dead-code
Make sure to use filtering while in fixed-size mode
oopsie. forgot to displatch SET_BUFFERS_GEOMETRY
Avoid repeatedly allocating and freeing memory in CameraSource
After failing to create an AudioTrack, only stop the source if we were the ones starting it.
Convert a number of assertions into runtime errors (OggExtractor)
fix [2712278] The preview buffer left some black borders in left and bottom edges
Fix 2667859: change text back to default size
Support for thumbnail extraction in the Matroska extractor.
...
opaque 32-bits windows are now allocated as RGBX_8888 buffers and
SurfaceFlinger always uses GL_MODULATE instead of trying to
optimize to GL_REPLACE when possible (makes no sense on
h/w accelerated GL).
we still have a small hack for devices that don't support
RGBX_8888 in their gralloc implementation where we revert to
RGBA_8888.
Merge commit '8799cdfb012935501e47f15f28d6a8ed90bd464d' into kraken
* commit '8799cdfb012935501e47f15f28d6a8ed90bd464d':
Doc change: rename slide decks for sorting by year then quarter.
Merge commit 'de56c27dab020bf85187c8bcfc6842cb31006c59' into froyo-plus-aosp
* commit 'de56c27dab020bf85187c8bcfc6842cb31006c59':
Doc change: rename slide decks for sorting by year then quarter.
Merge commit '1f5e847350ef1aece046666e20e7692a1651d9dc' into kraken
* commit '1f5e847350ef1aece046666e20e7692a1651d9dc':
Comment-only change to add documentation for FileObserver
Merge commit 'a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp
* commit 'a80331c4d75cb8a7122e31315bc1e2950131659c':
Comment-only change to add documentation for FileObserver