summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 3c0425cd: am 0ecf0b8d: Merge "Additional parameter validation for EGL ↵Jean-Baptiste Queru2013-06-251-6/+11
|\ | | | | | | | | | | | | functions" * commit '3c0425cd95a7918d1dbfecf32aef3b238bf236a5': Additional parameter validation for EGL functions
| * am 0ecf0b8d: Merge "Additional parameter validation for EGL functions"Jean-Baptiste Queru2013-06-251-6/+11
| |\ | | | | | | | | | | | | * commit '0ecf0b8db74682222bf095a235e28edefff871a5': Additional parameter validation for EGL functions
| | * Merge "Additional parameter validation for EGL functions"Jean-Baptiste Queru2013-06-251-6/+11
| | |\
| | | * Additional parameter validation for EGL functionsMichael Chock2012-09-121-6/+11
| | | | | | | | | | | | | | | | Change-Id: I841d005647559799edbc2c4824c61ea5791cf893
* | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-06-120-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: Ib28265f84583e4c1c8860f359145f38737817e99
| * | | | Prevent IPCThreadState::joinThreadPool from spinning on unexpected errorJeff Tinker2013-06-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds logging to help determine what is happening to the /dev/binder fd and dump the process state when it happens. bug: 8912673 Change-Id: I2aa0c66fc499e91e0bf9ee4ae20404bec35adc82
* | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-120-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I02e004028811a3efad8c010ed19e216bb87814d7
| * \ \ \ \ merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-120-0/+0
| |\ \ \ \ \ | | |/ / / /
* | | | | | am ef07386e: Prevent IPCThreadState::joinThreadPool from spinning on ↵Jeff Tinker2013-06-111-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | | | | | | | | | | unexpected error * commit 'ef07386e2fca73680214ececc3c9c0ecbb0f6d88': Prevent IPCThreadState::joinThreadPool from spinning on unexpected error
| * | | | Prevent IPCThreadState::joinThreadPool from spinning on unexpected errorJeff Tinker2013-06-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds logging to help determine what is happening to the /dev/binder fd and dump the process state when it happens. bug: 8912673 Change-Id: I2aa0c66fc499e91e0bf9ee4ae20404bec35adc82
* | | | | am 86b2ecdd: Merge "fix mem leak on error handling"Jeff Brown2013-05-291-1/+3
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '86b2ecdd311fca2e1e4a3504bf96bb23c5630492': fix mem leak on error handling
| * | | | Merge "fix mem leak on error handling"Jeff Brown2013-05-301-1/+3
| |\ \ \ \
| | * | | | fix mem leak on error handlingHyejin Kim2013-05-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I40d8e371c46184aa701fa676246201a9d8f6e27d
* | | | | | am 1c45dc66: Merge "Fix AMotionEvent_getHistorical* to take const ↵Andrew Hsieh2013-05-291-5/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AInputEvent* motion_event" * commit '1c45dc66c77f0ddb246a55d780206a183740ff7f': Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
| * | | | | Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"Andrew Hsieh2013-05-301-5/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_eventAndrew Hsieh2013-05-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See b.android.com/55873 Change-Id: I92c549e1a595662d4df8fa0e47675ccb2b8814fd
* | | | | | am 74bd799e: Merge "Exit dumpstate on SIGPIPE to avoid cascading child crashes"jp abgrall2013-05-281-1/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '74bd799ec20d2420459fa382533b1cc39ca9a54c': Exit dumpstate on SIGPIPE to avoid cascading child crashes
| * | | | | Merge "Exit dumpstate on SIGPIPE to avoid cascading child crashes"jp abgrall2013-05-281-1/+9
| |\ \ \ \ \
| | * | | | | Exit dumpstate on SIGPIPE to avoid cascading child crashesJohn Michelau2013-05-281-1/+9
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dumpstate ignores SIGPIPE it can lead to a cascade of tombstones / coredumps since many of its children don't handle or ignore it. It's best to just exit dumpstate once the pipe is broken. Change-Id: Ic0c57ecf4171f0c0a07837e51c41cb1876e1350c
* | | | | | am 135e4dbd: Merge "utils: Allow non android namespaces to use ALOGD_IF_SLOW"Jeff Brown2013-05-281-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '135e4dbd65d49730fbd6f830de7b303e01d20d5f': utils: Allow non android namespaces to use ALOGD_IF_SLOW
| * | | | | Merge "utils: Allow non android namespaces to use ALOGD_IF_SLOW"Jeff Brown2013-05-281-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | utils: Allow non android namespaces to use ALOGD_IF_SLOWNaseer Ahmed2013-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9207b64954fae2f56cc5f6aa5796a2e737400623
* | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-200-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | Change-Id: I400727c668eff57b5760595787d21dd021464587
| * | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-190-0/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | am 23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger and system_server ↵Mathias Agopian2013-05-171-27/+117
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | could deadlock * commit '23dacde4b624921df4f2c9646d20ca7acae357b6': [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
| * | | | | [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlockMathias Agopian2013-05-171-27/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because surfaceflinger handles screenshot in a different thread from the binder thread that requested it and because the IGraphicBufferProducer is a synchronous interface calling back into the system server; it is possible for the latter to run out of binder threads (b/c it holds a lock while calling into SF). The solution is to make sure all calls on IGraphicBufferProducer happen on the incoming binder thread. We achieve this by creating a IGBP wrapper which is given to the screenshot code. Bug: 8734824 Change-Id: Ife2441c7322e51ecfb20e0df03dacf6bce49578e
* | | | | | am ea74d3b7: make the warning timout of Fence::waitForever() implicit and longerMathias Agopian2013-05-177-9/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'ea74d3b78d607cde17790a7bb83e6f68ffd34cfd': make the warning timout of Fence::waitForever() implicit and longer
| * | | | | make the warning timout of Fence::waitForever() implicit and longerMathias Agopian2013-05-167-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - timeout is now 3 seconds instead of 1 - simplifies the API a bit - allows us to change/tweak this timeout globaly Bug: 8988871 Change-Id: I8d3c6ec43a372f602fb3f29856710339f86c0ec9
* | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: Ic457c583534afce9b1697b3b34221a729e2bc5b2
| * | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-130-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-090-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-080-0/+0
| | | |\ \ \ \
| | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-070-0/+0
| | | | |\ \ \ \
| | | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-060-0/+0
| | | | | |\ \ \ \
| | | | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-010-0/+0
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-290-0/+0
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-240-0/+0
| | | | | | | | |\ \ \ \
| | | | | | | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-230-0/+0
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-220-0/+0
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-180-0/+0
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-170-0/+0
| | | | | | | | | | | | |\ \ \ \
* | | | | | | | | | | | | \ \ \ \ am e8fed71d: Merge "Abort surface composition if hw surface is invalid"Jesse Hall2013-05-131-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e8fed71da2d3e03ef933d308520bab5b860f05aa': Abort surface composition if hw surface is invalid
| * | | | | | | | | | | | | | | | Merge "Abort surface composition if hw surface is invalid"Jesse Hall2013-05-141-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Abort surface composition if hw surface is invalidMichael Chock2013-05-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an invalid display device is detected during surface composition (e.g., a simulated secondary display is removed), abort the composition. Change-Id: Ia6afb2e287882d8ae0614eb25463d3f85b687adf
* | | | | | | | | | | | | | | | | | am f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"Jesse Hall2013-05-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f0dcff89acb998179757ca66b5c6a2c585a980e9': gl_code.cpp: Remove a DOS style newline
| * | | | | | | | | | | | | | | | | Merge "gl_code.cpp: Remove a DOS style newline"Jesse Hall2013-05-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | gl_code.cpp: Remove a DOS style newlineBernhard Rosenkränzer2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3edd6e511371fa8b0afef2e90baed4662ed76c4 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | | | | | | | | | | | | | | am f743e3db: Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into ↵Eino-Ville Talvala2013-05-096-10/+84
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'f743e3db27dd639421913ee5e99d7a13ccc236ea': Add support for HAL_PIXEL_FORMAT_YCbCr_420_888
| * | | | | | | | | | | | | | | | | | Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-devEino-Ville Talvala2013-05-096-10/+84
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Add support for HAL_PIXEL_FORMAT_YCbCr_420_888Eino-Ville Talvala2013-05-066-10/+84
| | | |_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add fields to CpuConsumer::LockedBuffer for new information - New lock methods for GraphicBuffer and GraphicBufferMapper for the format Bug: 8734880 Change-Id: If31f82c62d64b6942cf4cc6e5715585c03273f12
generated by cgit v1.1 at 2025-08-05 02:25:15 +0000