Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 55f71bc0: Merge "Replace IInterface::asBinder() with a static" | Marco Nelissen | 2014-11-17 | 12 | -22/+22 |
|\ | |||||
| * | Replace IInterface::asBinder() with a static | Marco Nelissen | 2014-11-17 | 12 | -22/+22 |
* | | am 98d20f82: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-... | Dan Stoza | 2014-11-07 | 12 | -27/+62 |
|\ \ | |||||
| * \ | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev | Dan Stoza | 2014-11-07 | 12 | -27/+62 |
| |\ \ | |||||
| | * | | Add a BufferItem parameter to onFrameAvailable | Dan Stoza | 2014-11-07 | 12 | -27/+62 |
* | | | | am c6f93a43: Merge "Add missing include to fix libc++ build." | Dan Albert | 2014-11-07 | 1 | -0/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Add missing include to fix libc++ build. | Dan Albert | 2014-11-07 | 1 | -0/+2 |
| * | | | am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffe... | Jesse Hall | 2014-10-20 | 1 | -1/+6 |
| |\ \ \ | |||||
| * \ \ \ | am 9cc84950: Merge "Don\'t check if this == NULL." | Dan Albert | 2014-10-15 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | am a7eb4b74: Merge "Fix sockfd leakage in SensorService." into lmp-dev | Aravind Akella | 2014-10-03 | 1 | -9/+13 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | am f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fa... | Jesse Hall | 2014-10-02 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am 6ee97e74: Merge "Fix a null dereference." | Dan Albert | 2014-09-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp | Lajos Molnar | 2014-09-18 | 1 | -0/+29 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | am de288fe2: Revert "bufferqueue: workaround: allow NULL fence with queueBuffer" | Jesse Hall | 2014-11-04 | 1 | -6/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | Revert "bufferqueue: workaround: allow NULL fence with queueBuffer" | Jesse Hall | 2014-11-04 | 1 | -6/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | am 793fc0e1: Merge "Fix crash when user provides large values in the Parcel."... | Michael Lentine | 2014-11-01 | 2 | -4/+18 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Fix crash when user provides large values in the Parcel. | Michael Lentine | 2014-10-31 | 2 | -4/+18 |
* | | | | | | | | | am 1834f8ea: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT | Jesse Hall | 2014-10-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT | Jesse Hall | 2014-10-29 | 1 | -1/+1 |
* | | | | | | | | | am dcc959be: Merge "Adding eglInitialize and eglTerminate image creation and ... | Michael Lentine | 2014-10-21 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Adding eglInitialize and eglTerminate image creation and deletion." in... | Michael Lentine | 2014-10-21 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Adding eglInitialize and eglTerminate image creation and deletion. | Michael Lentine | 2014-10-09 | 1 | -0/+4 |
* | | | | | | | | | | am a069e853: am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence wi... | Jesse Hall | 2014-10-20 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffe... | Jesse Hall | 2014-10-20 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE) | Jesse Hall | 2014-10-19 | 1 | -1/+6 |
| | | |_|_|_|/ / | | |/| | | | | | |||||
* | | | | | | | | am 9cc84950: Merge "Don\'t check if this == NULL." | Dan Albert | 2014-10-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge "Don't check if this == NULL." | Dan Albert | 2014-10-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Don't check if this == NULL. | Dan Albert | 2014-09-16 | 1 | -1/+1 |
* | | | | | | | | am b7702c5c: Merge "BufferQueueProducer: Throttle EGL frame production." into... | Jesse Hall | 2014-10-08 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge "BufferQueueProducer: Throttle EGL frame production." into lmp-mr1-dev | Jesse Hall | 2014-10-08 | 1 | -1/+11 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | BufferQueueProducer: Throttle EGL frame production. | Eric Penner | 2014-10-03 | 1 | -1/+11 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | am 93176114: am a7eb4b74: Merge "Fix sockfd leakage in SensorService." into l... | Aravind Akella | 2014-10-03 | 1 | -9/+13 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Fix sockfd leakage in SensorService." into lmp-dev | Aravind Akella | 2014-10-03 | 1 | -9/+13 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Fix sockfd leakage in SensorService. | Aravind Akella | 2014-10-02 | 1 | -9/+13 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | am 74efd6e6: am f05ef4e5: Merge "Surface: cancel the dequeued buffer when req... | Jesse Hall | 2014-10-02 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Surface: cancel the dequeued buffer when requestBuffer fails | Jesse Hall | 2014-10-02 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | am 6ee97e74: Merge "Fix a null dereference." | Dan Albert | 2014-09-23 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Fix a null dereference. | Dan Albert | 2014-09-23 | 1 | -1/+1 |
* | | | | | resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp | Lajos Molnar | 2014-09-19 | 1 | -0/+29 |
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | |||||
| * | | | surfaceflinger: add getDisplayStats() method | Lajos Molnar | 2014-09-18 | 1 | -0/+29 |
* | | | | am e1e3d278: Merge "Clean cruft out of makefiles." | Dan Albert | 2014-09-12 | 1 | -7/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Clean cruft out of makefiles. | Dan Albert | 2014-09-11 | 1 | -7/+1 |
| | |/ | |/| | |||||
* | | | am 8493b79e: SensorService fixes | Aravind Akella | 2014-09-12 | 1 | -3/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | SensorService fixes | Aravind Akella | 2014-09-10 | 1 | -3/+3 |
* | | | am d15ef27f: Update ScreenshotClient to take advantage of rotation in surface... | Riley Andrews | 2014-09-09 | 1 | -4/+14 |
|\ \ \ | |/ / | |||||
| * | | Update ScreenshotClient to take advantage of rotation in surfaceflinger's scr... | Riley Andrews | 2014-09-09 | 1 | -4/+14 |
* | | | am edb86f9f: Merge "Add rotation to surfaceflingers screen cap." into lmp-dev | Riley Andrews | 2014-09-09 | 1 | -2/+6 |
|\ \ \ | |/ / | |||||
| * | | Add rotation to surfaceflingers screen cap. | Riley Andrews | 2014-09-09 | 1 | -2/+6 |
* | | | resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp | Dan Albert | 2014-09-08 | 4 | -20/+20 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Make string literal concatenation play nice with C++11. | Dan Albert | 2014-09-08 | 5 | -25/+25 |