summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 05be6d6f to masterDianne Hackborn2011-05-091-0/+2
|\
| * am 4907d1d5: am 0c6cbf41: Merge "Better compat mode part one: start scaling w...Dianne Hackborn2011-05-091-0/+2
| |\
| | * Better compat mode part one: start scaling windows.Dianne Hackborn2011-05-091-0/+2
| | * DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-031-3/+2
| * | am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature fo...Mike Lockwood2011-05-041-3/+2
| |\ \
| | * | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-041-3/+2
| | |/
* | | Add const to the finders method in MetaData.cppJames Dong2011-05-092-7/+7
* | | Add end of recording summary track infoJames Dong2011-05-091-0/+4
* | | Refactor MPEG4Writer::writeTrackHeader() methodJames Dong2011-05-091-0/+3
* | | Initial check-in for AACWriterJames Dong2011-05-041-0/+75
* | | Merge "Initial CL for the timed text support: - Add support for MP4 timed tex...Gloria Wang2011-05-044-0/+9
|\ \ \
| * | | Initial CL for the timed text support:Gloria Wang2011-05-034-0/+9
* | | | frameworks/base: android_native_buffer_t -> ANativeWindowBufferIliyan Malchev2011-05-035-26/+26
* | | | frameworks/base: move ANativeWindow/android_native_buffer_t outIliyan Malchev2011-05-032-449/+2
* | | | frameworks/base: switch CameraService to a HAL moduleIliyan Malchev2011-05-031-266/+0
* | | | frameworks/base: make the ANativeWindow query() method constIliyan Malchev2011-05-034-6/+6
* | | | frameworks/base: include system/core header camera.h in Camera.hIliyan Malchev2011-05-031-101/+7
|/ / /
* | | Merge "Add an auto-exposure lock feature to the Camera API."Eino-Ville Talvala2011-05-031-0/+20
|\ \ \
| * | | Add an auto-exposure lock feature to the Camera API.Eino-Ville Talvala2011-05-021-0/+20
* | | | Merge "remove last traces of copybit"Mathias Agopian2011-05-021-16/+0
|\ \ \ \
| * | | | remove last traces of copybitMathias Agopian2011-05-021-16/+0
* | | | | Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947"Gloria Wang2011-04-293-0/+7
|\ \ \ \ \
| * | | | | Add setParameter/getParameter to MediaPlayer API.Gloria Wang2011-04-293-0/+7
| |/ / / /
* | | | | Add DRM errors in the DRM frameworks to MediaErrors also.Gloria Wang2011-04-292-9/+22
|/ / / /
* | | | get rid of dependency on copybit HAL moduleMathias Agopian2011-04-282-25/+0
|/ / /
* | | Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73Dima Zavin2011-04-2710-362/+141
|\ \ \
| * | | audio/media: convert to using the audio HAL and new audio defsDima Zavin2011-04-2710-322/+70
| * | | libmedia: move AudioParameter out of AudioSystemDima Zavin2011-04-272-44/+75
* | | | am d84df054: am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaEr...Gloria Wang2011-04-271-0/+11
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.hGloria Wang2011-04-271-0/+11
| |\ \ | | |/
| | * Add heartbeat error codes into MediaErrors.hGloria Wang2011-04-261-0/+11
* | | fix typo in Vector<>:: push_back and push_frontMathias Agopian2011-04-251-2/+2
* | | Merge "Add some basic STL compatibility to Vector<>"Mathias Agopian2011-04-251-0/+20
|\ \ \
| * | | Add some basic STL compatibility to Vector<>Mathias Agopian2011-04-251-0/+20
* | | | Merge "MediaScanner: reimplement the ".nomedia" feature for hiding files from...Mike Lockwood2011-04-251-3/+2
|\ \ \ \
| * | | | MediaScanner: reimplement the ".nomedia" feature for hiding files from the me...Mike Lockwood2011-04-251-3/+2
| |/ / /
* | | | Merge "Clarify the meaning of weight in the focus and metering area HAL."Eino-Ville Talvala2011-04-251-9/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Clarify the meaning of weight in the focus and metering area HAL.Eino-Ville Talvala2011-04-251-9/+12
* | | | Get rid of the "pid" parameter from createSurfaceMathias Agopian2011-04-202-3/+0
* | | | Merge "Initial checkin of spot presentation for touchpad gestures."Jeff Brown2011-04-191-0/+5
|\ \ \ \
| * | | | Initial checkin of spot presentation for touchpad gestures.Jeff Brown2011-04-191-0/+5
* | | | | Merge "changes to SurfaceTexture needed for unification with SF"Mathias Agopian2011-04-182-3/+44
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | changes to SurfaceTexture needed for unification with SFMathias Agopian2011-04-112-3/+44
* | | | | Merge "Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)"Andreas Huber2011-04-181-1/+2
|\ \ \ \ \
| * | | | | Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)Andreas Huber2011-04-131-1/+2
* | | | | | Merge "Fix a GraphicBuffer leak in SurfaceTexture"Mathias Agopian2011-04-152-15/+1
|\ \ \ \ \ \
| * | | | | | Fix a GraphicBuffer leak in SurfaceTextureMathias Agopian2011-04-082-15/+1
| | |/ / / / | |/| | | |
* | | | | | Add Java API for writing TTS enginesBjorn Bringert2011-04-151-232/+0
* | | | | | Replace a custom AndroidRuntime::findClass with a more targeted fix.Elliott Hughes2011-04-131-6/+12
| |_|/ / / |/| | | |
* | | | | Merge "- Add another parameter in notify() to be able to send timed text samp...Gloria Wang2011-04-133-6/+9
|\ \ \ \ \ | |_|/ / / |/| | | |