summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Expand)AuthorAgeFilesLines
* am dcc959be: Merge "Adding eglInitialize and eglTerminate image creation and ...Michael Lentine2014-10-211-0/+4
|\
| * Merge "Adding eglInitialize and eglTerminate image creation and deletion." in...Michael Lentine2014-10-211-0/+4
| |\
| | * Adding eglInitialize and eglTerminate image creation and deletion.Michael Lentine2014-10-091-0/+4
* | | am a069e853: am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence wi...Jesse Hall2014-10-201-1/+6
|\ \ \ | |/ /
| * | am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffe...Jesse Hall2014-10-201-1/+6
| |\ \
| | * | bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)Jesse Hall2014-10-191-1/+6
* | | | am c52e54c4: Merge "Some more test cleanup."Dan Albert2014-10-172-30/+36
|\ \ \ \
| * | | | Some more test cleanup.Dan Albert2014-10-162-30/+36
* | | | | am 9cc84950: Merge "Don\'t check if this == NULL."Dan Albert2014-10-152-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Don't check if this == NULL."Dan Albert2014-10-152-3/+3
| |\ \ \ \
| | * | | | Don't check if this == NULL.Dan Albert2014-09-162-3/+3
* | | | | | am 16410d45: am 9ea09757: Fix broken error check in Parcel::readBlobNarayan Kamath2014-10-101-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 9ea09757: Fix broken error check in Parcel::readBlobNarayan Kamath2014-10-091-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Fix broken error check in Parcel::readBlobNarayan Kamath2014-10-081-1/+1
* | | | | am b7702c5c: Merge "BufferQueueProducer: Throttle EGL frame production." into...Jesse Hall2014-10-081-1/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge "BufferQueueProducer: Throttle EGL frame production." into lmp-mr1-devJesse Hall2014-10-081-1/+11
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | BufferQueueProducer: Throttle EGL frame production.Eric Penner2014-10-031-1/+11
* | | | | am 366998d8: am 78639c22: Merge "Parcel: extra validation/debug code for writ...Jesse Hall2014-10-071-0/+25
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into l...Jesse Hall2014-10-061-0/+25
| |\ \ \ \
| | * | | | Parcel: extra validation/debug code for writeDupFileDescriptorJesse Hall2014-10-061-0/+25
| | |/ / /
* | | | | am 93176114: am a7eb4b74: Merge "Fix sockfd leakage in SensorService." into l...Aravind Akella2014-10-031-9/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix sockfd leakage in SensorService." into lmp-devAravind Akella2014-10-031-9/+13
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix sockfd leakage in SensorService.Aravind Akella2014-10-021-9/+13
* | | | | am 74efd6e6: am f05ef4e5: Merge "Surface: cancel the dequeued buffer when req...Jesse Hall2014-10-021-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp...Jesse Hall2014-10-021-0/+1
| |\ \ \ \
| | * | | | Surface: cancel the dequeued buffer when requestBuffer failsJesse Hall2014-10-021-0/+1
| | |/ / /
* | | | | am 36462d9d: Merge "Add more logging for dup(fd) failure" into lmp-devMichael Lentine2014-10-021-3/+15
|\ \ \ \ \ | |/ / / /
| * | | | Add more logging for dup(fd) failureMichael Lentine2014-10-021-3/+15
| |/ / /
* | | | am 5ee2c9d2: Work on issue #17656716: Unhandled exception in Window ManagerDianne Hackborn2014-10-021-8/+13
|\ \ \ \ | |/ / /
| * | | Work on issue #17656716: Unhandled exception in Window ManagerDianne Hackborn2014-09-301-8/+13
* | | | am 6ee97e74: Merge "Fix a null dereference."Dan Albert2014-09-231-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Fix a null dereference.Dan Albert2014-09-231-1/+1
* | | | resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aospLajos Molnar2014-09-191-0/+29
|\ \ \ \ | | |/ / | |/| |
| * | | surfaceflinger: add getDisplayStats() methodLajos Molnar2014-09-181-0/+29
* | | | am e1e3d278: Merge "Clean cruft out of makefiles."Dan Albert2014-09-122-13/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Clean cruft out of makefiles.Dan Albert2014-09-112-13/+3
* | | | am 4a7001ca: Merge "Work around C11 const atomic restrictions."Hans Boehm2014-09-121-1/+9
|\ \ \ \ | |/ / /
| * | | Work around C11 const atomic restrictions.Hans Boehm2014-09-111-1/+9
| | |/ | |/|
* | | am 8493b79e: SensorService fixesAravind Akella2014-09-121-3/+3
|\ \ \ | | |/ | |/|
| * | SensorService fixesAravind Akella2014-09-101-3/+3
* | | am d15ef27f: Update ScreenshotClient to take advantage of rotation in surface...Riley Andrews2014-09-091-4/+14
|\ \ \ | |/ /
| * | Update ScreenshotClient to take advantage of rotation in surfaceflinger's scr...Riley Andrews2014-09-091-4/+14
* | | am edb86f9f: Merge "Add rotation to surfaceflingers screen cap." into lmp-devRiley Andrews2014-09-091-2/+6
|\ \ \ | |/ /
| * | Add rotation to surfaceflingers screen cap.Riley Andrews2014-09-091-2/+6
| * | Fix CAS argument type.Hans Boehm2014-09-021-1/+1
| * | Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""Hans Boehm2014-09-021-14/+18
* | | resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aospDan Albert2014-09-084-20/+20
|\ \ \ | | |/ | |/|
| * | Make string literal concatenation play nice with C++11.Dan Albert2014-09-085-25/+25
* | | am 5c4a1566: Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp...Eric Penner2014-08-272-9/+78
|\ \ \ | | |/ | |/|
| * | GLConsumer: Fix eglTerminate/eglInit edge case.Eric Penner2014-08-272-9/+78