summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | - Add another parameter in notify() to be able to send timed text sampleGloria Wang2011-04-133-6/+9
| |/ / /
* | | | Merge "Add camera metering area API."Wu-cheng Li2011-04-131-0/+38
|\ \ \ \
| * | | | Add camera metering area API.Wu-cheng Li2011-04-131-0/+38
| |/ / /
* | | | resolved conflicts for merge of 18490fb9 to masterKenny Root2011-04-122-4/+33
|\ \ \ \ | | |/ / | |/| |
| * | | resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aospKenny Root2011-04-122-4/+33
| |\ \ \ | | |_|/ | |/| |
| | * | am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."Kenny Root2011-04-112-4/+33
| | |\ \
| | | * | Runtime resource overlay, iteration 1.MÃ¥rten Kongstad2011-04-012-4/+33
| | * | | am c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 ...Russell Brenner2011-03-311-0/+6
| | |\ \ \ | | | |/ /
| | | * | Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildableRussell Brenner2011-03-311-0/+6
| | * | | am 49b49f8f: Added include/private/hwui/DrawGlInfo.hRussell Brenner2011-03-311-0/+50
| | |\ \ \ | | | |/ /
| | | * | Added include/private/hwui/DrawGlInfo.hRussell Brenner2011-03-311-0/+50
| | * | | am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher (l...Mathias Agopian2011-03-071-14/+48
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) onlyMathias Agopian2011-03-071-14/+48
| | * | | am 93552de8: Merge "stubs"Jean-Baptiste Queru2011-02-111-0/+4
| | |\ \ \
| | | * | | stubsSteve Block2011-02-111-0/+4
| | * | | | am a6fb375c: am 056340ac: Merge "stubs"Jean-Baptiste Queru2011-01-313-0/+88
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "stubs"Jean-Baptiste Queru2011-01-313-0/+88
| | | |\ \ \