summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updated MediaDrm API based on review input.Jeff Tinker2013-03-133-194/+205
* Merge "atrace: add the webview category" into jb-mr2-devJamie Gennis2013-03-121-30/+31
|\
| * atrace: add the webview categoryJamie Gennis2013-03-111-30/+31
* | temporary: enable ASSERTs in RefBaseMathias Agopian2013-03-111-0/+1
* | Fix missing recents screenshotsMathias Agopian2013-03-111-6/+8
* | Merge "Add TOUCH_NAVIGATION input source" into jb-mr2-devMichael Wright2013-03-121-0/+2
|\ \
| * | Add TOUCH_NAVIGATION input sourceMichael Wright2013-03-111-0/+2
* | | workaround a deadlock when taking screenshots into a surfaceMathias Agopian2013-03-111-2/+2
| |/ |/|
* | Merge "Add Thread::isRunning and Condition::signal(WakeUpType)" into jb-mr2-devRomain Guy2013-03-113-0/+21
|\ \
| * | Add Thread::isRunning and Condition::signal(WakeUpType)Romain Guy2013-03-113-0/+21
* | | am 1d6e52d1: am 50d36d58: am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-...Jean-Baptiste Queru2013-03-110-0/+0
|\ \ \
| * \ \ am 50d36d58: am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Recon...Jean-Baptiste Queru2013-03-110-0/+0
| |\ \ \
| | * \ \ am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-...Jean-Baptiste Queru2013-03-110-0/+0
| | |\ \ \
| | | * \ \ am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release -...Jean-Baptiste Queru2013-03-110-0/+0
| | | |\ \ \
| | | | * \ \ am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |\ \ \ | | | |/ / / /
| | | | * | | Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |\ \ \
* | | | | \ \ \ am ba8abb51: Merge "Ensure dumpstate children die"jp abgrall2013-03-111-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge "Ensure dumpstate children die"jp abgrall2013-03-111-0/+4
| |\ \ \ \ \ \
| | * | | | | | Ensure dumpstate children dieJohn Michelau2013-03-111-0/+4
| |/ / / / / /
* | | | | | | make sure to call compositionComplete after taking a screenshotMathias Agopian2013-03-081-0/+3
* | | | | | | add two libgui testsMathias Agopian2013-03-081-0/+75
* | | | | | | Merge changes Ibb3b6ff0,I2341e20c into jb-mr2-devMathias Agopian2013-03-086-26/+49
|\ \ \ \ \ \ \
| * | | | | | | rename binder services main thread to Binder_*Mathias Agopian2013-03-075-25/+48
| * | | | | | | limit number of extra binder threads in SF to 4Mathias Agopian2013-03-071-1/+1
* | | | | | | | Merge "When disconnecting a surface, cancel don't queue the buffer" into jb-m...Jesse Hall2013-03-071-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | When disconnecting a surface, cancel don't queue the bufferJesse Hall2013-03-071-2/+1
* | | | | | | | | Merge "Defer destroying surfaces until not current" into jb-mr2-devJesse Hall2013-03-071-5/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | |
| * | | | | | | Defer destroying surfaces until not currentJesse Hall2013-03-071-5/+12
* | | | | | | | resolved conflicts for merge of bfb2aa46 to jb-mr2-devJean-Baptiste Queru2013-03-070-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge "Tweaks for forward compatibility"Jean-Baptiste Queru2013-03-073-0/+91
| |\ \ \ \ \ \ \
| | * | | | | | | Tweaks for forward compatibilityJean-Baptiste Queru2013-03-063-0/+91
| |/ / / / / / /
* | | | | | | | another attempt to fix the buildMathias Agopian2013-03-062-2/+4
| |/ / / / / / |/| | | | | |
* | | | | | | attempt to fix buildMathias Agopian2013-03-061-0/+4
* | | | | | | Merge changes I7f696e42,I51c6df3c into jb-mr2-devMathias Agopian2013-03-072-5/+4
|\ \ \ \ \ \ \
| * | | | | | | Make GraphicBuffer a RefBaseMathias Agopian2013-03-061-4/+3
| * | | | | | | Fix RefBase debugging. O_CREAT must specify the mode.Mathias Agopian2013-03-061-1/+1
* | | | | | | | workaround to fix screenshot leak on N4Mathias Agopian2013-03-061-0/+3
|/ / / / / / /
* | | | | | | Merge changes I66511c08,Ia051949f,Ic7451365,I5b571a4c into jb-mr2-devMathias Agopian2013-03-0718-1414/+976
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Get rid of LayerBase.Mathias Agopian2013-03-0514-1238/+943
| * | | | | | Make LayerDim a regular Layer instead of a LayerBaseMathias Agopian2013-03-053-4/+27
| * | | | | | fold LayerBaseClient into LayerBaseMathias Agopian2013-03-0510-159/+104
| * | | | | | Remove support for ScreenshotLayerMathias Agopian2013-03-057-112/+1
* | | | | | | Return NO_MEMORY when glReadPixels() fails.Jeff Sharkey2013-03-051-0/+2
|/ / / / / /
* | | | | | Merge "CpuConsumer_test: Extend test with new formats RGBA8888 and optional Y...Igor Murashkin2013-03-051-9/+255
|\ \ \ \ \ \
| * | | | | | CpuConsumer_test: Extend test with new formats RGBA8888 and optional Y8/Y16Igor Murashkin2013-03-051-9/+255
* | | | | | | Add eglPresentationTimeANDROIDAndy McFadden2013-03-055-1/+37
* | | | | | | Merge "rework screenshot API and implementation" into jb-mr2-devMathias Agopian2013-03-059-330/+269
|\ \ \ \ \ \ \
| * | | | | | | rework screenshot API and implementationMathias Agopian2013-03-019-330/+269
* | | | | | | | Merge "Init displays to null layer stack" into jb-mr2-devJesse Hall2013-03-053-8/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Init displays to null layer stackJesse Hall2013-02-283-8/+14