summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "framework/native/docs: remove doc footer for jd output"android-m-previewJohan Euphrosine2015-05-273-4/+3
|\
| * framework/native/docs: remove doc footer for jd outputJohan Euphrosine2015-05-273-4/+3
|/
* Merge "frameworks/native/docs: add doxygen configuration"Johan Euphrosine2015-05-223-0/+1919
|\
| * frameworks/native/docs: add doxygen configurationJohan Euphrosine2015-05-213-0/+1919
|/
* Merge "Don't use TEMP_FAILURE_RETRY on close in frameworks/native."Elliott Hughes2015-05-162-2/+2
|\
| * Don't use TEMP_FAILURE_RETRY on close in frameworks/native.Elliott Hughes2015-05-152-2/+2
* | Merge "SurfaceFlinger: Handle EGL errors more cleanly"Dan Stoza2015-05-142-1/+21
|\ \ | |/ |/|
| * SurfaceFlinger: Handle EGL errors more cleanlyDan Stoza2015-05-142-1/+21
|/
* Merge "Replace JNI primitive array critical calls with non-critical ones."Hiroshi Yamauchi2015-05-1315-161/+395
|\
| * Replace JNI primitive array critical calls with non-critical ones.Hiroshi Yamauchi2015-05-1315-161/+395
* | Merge "Fix PTS handling for buffer replacement"Dan Stoza2015-05-1314-99/+98
|\ \
| * | Fix PTS handling for buffer replacementDan Stoza2015-05-1314-99/+98
* | | Merge "binder: add uint64 support to Parcel."Dan Stoza2015-05-132-0/+18
|\ \ \ | |/ / | | / | |/ |/|
| * binder: add uint64 support to Parcel.Ronghua Wu2015-05-132-0/+18
|/
* Merge "libgui: Always allow allocation on connect"Dan Stoza2015-05-121-0/+1
|\
| * libgui: Always allow allocation on connectDan Stoza2015-05-121-0/+1
* | Merge "frameworks/native: document native types and enums"Johan Euphrosine2015-05-1215-278/+1966
|\ \ | |/ |/|
| * frameworks/native: document native types and enumsJohan Euphrosine2015-05-1215-278/+1966
|/
* Merge "libgui: Hook up onFrameReplaced"Dan Stoza2015-05-125-22/+42
|\
| * libgui: Hook up onFrameReplacedDan Stoza2015-05-125-22/+42
|/
* Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension"Jesse Hall2015-05-112-0/+6
|\
| * libEGL: whitelist the EGL_KHR_create_context_no_error extensionJesse Hall2015-05-112-0/+6
|/
* Merge "Added Voltage and Current regulator ftrace events to atrace"Chris Craik2015-05-071-0/+3
|\
| * Added Voltage and Current regulator ftrace events to atraceAaron Schulman2015-02-251-0/+3
* | Merge "SF: Apply pending transactions to new sidebands"Dan Stoza2015-05-061-0/+4
|\ \
| * | SF: Apply pending transactions to new sidebandsDan Stoza2015-05-051-0/+4
|/ /
* | Merge "libgui: Clear frame number while freeing slot"Dan Stoza2015-05-042-1/+4
|\ \
| * | libgui: Clear frame number while freeing slotDan Stoza2015-05-012-1/+4
|/ /
* | Merge "dumpstate: report per-partition MMC performance"Mark Salyzyn2015-05-013-1/+141
|\ \
| * | dumpstate: report per-partition MMC performanceMark Salyzyn2015-04-303-1/+141
* | | Merge "SurfaceFlinger: Fix PTS on stale buffers"Dan Stoza2015-05-019-4/+100
|\ \ \
| * | | SurfaceFlinger: Fix PTS on stale buffersDan Stoza2015-04-309-4/+100
* | | | Merge "SurfaceFlinger: Limit to 4k Layers"Dan Stoza2015-04-302-9/+24
|\ \ \ \
| * | | | SurfaceFlinger: Limit to 4k LayersDan Stoza2015-04-302-9/+24
| |/ / /
* | | | Merge "SurfaceFlinger: Fix integer overflow in Mesh ctor"Dan Stoza2015-04-301-2/+28
|\ \ \ \
| * | | | SurfaceFlinger: Fix integer overflow in Mesh ctorDan Stoza2015-04-301-2/+28
| |/ / /
* | | | Merge "Close Fence FDs in error cases of Surface and GraphicBufferMapper"Dan Stoza2015-04-302-0/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | Close Fence FDs in error cases of Surface and GraphicBufferMapperTaiju Tsuiki2015-04-302-0/+9
* | | | Merge "Remove gamma correction from color correction shader"Dan Stoza2015-04-301-2/+0
|\ \ \ \
| * | | | Remove gamma correction from color correction shaderAlan Viverette2015-04-291-2/+0
| | |/ / | |/| |
* | | | Merge "Avoid closing invalid FD in Surface and GraphicBufferMapper"Dan Stoza2015-04-301-4/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Avoid closing invalid FD in Surface and GraphicBufferMapperTaiju Tsuiki2015-04-301-4/+8
| |/ /
* | | Merge "BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE query"Dan Stoza2015-04-293-1/+22
|\ \ \
| * | | BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE queryDan Stoza2015-04-283-1/+22
* | | | Merge "libgui: Implement onTransact for sideband streams"Dan Stoza2015-04-291-0/+9
|\ \ \ \
| * | | | libgui: Implement onTransact for sideband streamsDan Stoza2015-04-281-0/+9
* | | | | Merge "Parcel.cpp: use calloc instead of malloc"Nick Kralevich2015-04-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Parcel.cpp: use calloc instead of mallocNick Kralevich2015-04-281-1/+1
|/ / / /
* | | | Merge "libgui: Change detachNextBuffer to return sp<GB>"Dan Stoza2015-04-282-3/+3
|\ \ \ \
| * | | | libgui: Change detachNextBuffer to return sp<GB>Dan Stoza2015-04-272-3/+3
|/ / / /