summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Use rand() for MinGWKenny Root2011-06-151-0/+3
* Merge "may fix build on some version of gcc"Mathias Agopian2011-06-141-0/+1
|\
| * may fix build on some version of gccMathias Agopian2011-06-141-0/+1
* | Merge "Support for setting a ParcelSurfaceTexture as the MediaPlayer sink."tedbo2011-06-142-0/+9
|\ \
| * | Support for setting a ParcelSurfaceTexture as the MediaPlayer sink.tedbo2011-06-132-0/+9
* | | Merge "audio: update for audio/audio_policy header names/locations"Dima Zavin2011-06-132-2/+2
|\ \ \
| * | | audio: update for audio/audio_policy header names/locationsDima Zavin2011-06-132-2/+2
* | | | Merge "Add B frame support for MPEG4Writer"James Dong2011-06-132-0/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add B frame support for MPEG4WriterJames Dong2011-06-132-0/+7
| | |/ | |/|
* | | fix RefBase so it retains binary-compatibility with gingerbreadMathias Agopian2011-06-131-7/+13
* | | unify SurfaceTexture and SurfaceMathias Agopian2011-06-137-458/+15
| |/ |/|
* | Merge "libutils: add a binary blob cache implementation."Jamie Gennis2011-06-131-0/+181
|\ \
| * | libutils: add a binary blob cache implementation.Jamie Gennis2011-05-171-0/+181
* | | Merge changes I56779420,I044e44e1,Ic5adfa29,Ied541ab8Jamie Gennis2011-06-131-3/+14
|\ \ \
| * | | SurfaceTexture: fix up a comment.Jamie Gennis2011-06-131-3/+3
| * | | SurfaceTexture: fix a getTransformMatrix crash.Jamie Gennis2011-06-131-0/+11
* | | | Merge "Remove redundant memory barrier"Glenn Kasten2011-06-131-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove redundant memory barrierGlenn Kasten2011-06-101-0/+1
* | | | resolved conflicts for merge of f51ded0f to masterDianne Hackborn2011-06-101-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag p...Dianne Hackborn2011-06-091-1/+2
| |\ \ \
| | * | | Enforce public resource restriction on bag parents.Dianne Hackborn2011-06-091-1/+2
* | | | | Merge "Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing ...Jamie Gennis2011-06-103-0/+35
|\ \ \ \ \
| * | | | | Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Bin...tedbo2011-06-093-0/+35
* | | | | | Make dumpsys(media.player) more useful by having AwesomePlayer populate it.Andreas Huber2011-06-081-0/+4
| |_|_|/ / |/| | | |
* | | | | am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4...Jeff Brown2011-06-071-5/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into ...Jeff Brown2011-06-061-5/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2Jeff Brown2011-06-061-5/+0
| | |\ \ \
| | | * | | Revert velocity damping.Jeff Brown2011-06-061-5/+0
| | * | | | merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)Mathias Agopian2011-06-061-1/+8
| | |/ / /
| * | | | resolved conflicts for merge of b9783b49 to honeycomb-plus-aospMarco Nelissen2011-06-061-1/+8
| |\ \ \ \
| | * \ \ \ am c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into ginge...Simon Wilson2011-05-241-1/+8
| | |\ \ \ \
| | | * | | | RefBase subclasses can now decide how they want to be destroyed.Mathias Agopian2011-05-231-1/+8
* | | | | | | Merge "Improve android.hardware.Camera.Area javadoc."Wu-cheng Li2011-06-071-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Improve android.hardware.Camera.Area javadoc.Wu-cheng Li2011-06-071-2/+2
* | | | | | | | CameraParameters: add PIXEL_FORMAT_RGBA8888Iliyan Malchev2011-06-061-0/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h"James Dong2011-06-031-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.hJames Dong2011-06-031-0/+1
* | | | | | | | am 56503b8d: am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration....Jeff Brown2011-06-031-0/+81
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeyc...Jeff Brown2011-06-021-0/+81
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Implement pointer acceleration.Jeff Brown2011-06-021-0/+81
* | | | | | | resolved conflicts for merge of 54cb63e2 to masterDianne Hackborn2011-06-021-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens.Dianne Hackborn2011-05-271-0/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Add "tv" density for 720p screens.Dianne Hackborn2011-05-271-0/+1
* | | | | | | am da9837fb: am c058d386: am ff762299: Merge "Small fixes and cleanup of reso...Dianne Hackborn2011-06-021-42/+21
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | am c058d386: am ff762299: Merge "Small fixes and cleanup of resource config h...Dianne Hackborn2011-05-271-42/+21
| |\ \ \ \ \ | | |/ / / /
| | * | | | Small fixes and cleanup of resource config handling.Dianne Hackborn2011-05-271-42/+21
| * | | | | am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad g...Jeff Brown2011-05-251-0/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)Jeff Brown2011-05-251-0/+5
| * | | | | am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NO...Jeff Brown2011-05-251-0/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Refactor how timeouts are calculated. (DO NOT MERGE)Jeff Brown2011-05-231-0/+10