summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 40b4e23a: Merge "resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-p...Dan Stoza2015-01-272-98/+1
|\
| * Merge "resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp" int...Dan Stoza2015-01-272-98/+1
| |\
| | * resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aospDan Stoza2015-01-272-98/+1
| | |\
| | | * Revert "SurfaceFlinger: Attempt to attribute fds to layers"Dan Stoza2015-01-272-98/+1
* | | | am 39d890d9: am 6e32c037: Merge "Kill HAVE_PTHREADS."Yabin Cui2015-01-271-4/+1
|\ \ \ \ | |/ / /
| * | | am 6e32c037: Merge "Kill HAVE_PTHREADS."Yabin Cui2015-01-271-4/+1
| |\ \ \ | | |/ / | |/| |
| | * | Kill HAVE_PTHREADS.Yabin Cui2015-01-261-4/+1
* | | | am a5cbb1f1: am ef1c17ae: SurfaceFlinger: Make log message 64-bit compatibleDan Stoza2015-01-171-1/+1
|\ \ \ \ | |/ / /
| * | | am ef1c17ae: SurfaceFlinger: Make log message 64-bit compatibleDan Stoza2015-01-171-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | SurfaceFlinger: Make log message 64-bit compatibleDan Stoza2015-01-161-1/+1
* | | | am 3372cc25: resolved conflicts for merge of 03eccb66 to lmp-mr1-dev-plus-aospDan Stoza2015-01-172-1/+98
|\ \ \ \ | |/ / /
| * | | resolved conflicts for merge of 03eccb66 to lmp-mr1-dev-plus-aospDan Stoza2015-01-162-1/+98
| |\ \ \ | | |/ /
| | * | SurfaceFlinger: Attempt to attribute fds to layersDan Stoza2015-01-162-1/+98
| | * | Switch to libsigchain.aDmitriy Ivanov2014-12-102-23/+4
* | | | am 9c22ac77: am 5b730570: Merge "surfaceflinger: use Mutex timedLock instead ...Jesse Hall2015-01-131-9/+6
|\ \ \ \ | |/ / /
| * | | am 5b730570: Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"Jesse Hall2015-01-121-9/+6
| |\ \ \ | | | |/ | | |/|
| | * | Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"Jesse Hall2015-01-121-9/+6
| | |\ \
| | | * | surfaceflinger: use Mutex timedLock instead of tryLock loopJesse Hall2015-01-101-9/+6
* | | | | am 23958e14: am a7dcab69: Merge "We have POSIX clocks, and we don\'t need to ...Elliott Hughes2015-01-102-9/+2
|\ \ \ \ \ | |/ / / /
| * | | | am a7dcab69: Merge "We have POSIX clocks, and we don\'t need to ask for the o...Elliott Hughes2015-01-102-9/+2
| |\ \ \ \ | | |/ / /
| | * | | We have POSIX clocks, and we don't need to ask for the openssl headers.Elliott Hughes2015-01-092-9/+2
| | |/ /
* | | | am 106547c1: am 033f7e8e: Merge "InputDispatcher: Optimize count()"Narayan Kamath2014-12-242-14/+9
|\ \ \ \ | |/ / /
| * | | am 033f7e8e: Merge "InputDispatcher: Optimize count()"Narayan Kamath2014-12-242-14/+9
| |\ \ \ | | |/ /
| | * | Merge "InputDispatcher: Optimize count()"Narayan Kamath2014-12-242-14/+9
| | |\ \
| | | * | InputDispatcher: Optimize count()Jon McCaffrey2014-11-262-14/+9
| | * | | libgui: Enable -Weverything and -WerrorDan Stoza2014-12-054-11/+11
| * | | | am 5588d900: Merge "Enable clang for libui/libgui/surfaceflinger"Dan Albert2014-12-058-41/+29
| |\ \ \ \ | | |/ / /
| | * | | Enable clang for libui/libgui/surfaceflingerDan Stoza2014-12-048-41/+29
* | | | | libgui: Enable -Weverything and -WerrorDan Stoza2014-12-054-11/+11
* | | | | am db5827d3: am 5878444f: SurfaceFlinger: Listen to HWC invalidateDan Stoza2014-12-041-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 5878444f: SurfaceFlinger: Listen to HWC invalidateDan Stoza2014-12-031-2/+4
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | SurfaceFlinger: Listen to HWC invalidateDan Stoza2014-12-021-2/+4
* | | | | am 7d831769: am 46ca041f: Merge "Don\'t error out because SensorEventConnecti...Chih-hung Hsieh2014-11-261-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | am 46ca041f: Merge "Don\'t error out because SensorEventConnection::dump over...Chih-hung Hsieh2014-11-251-0/+7
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Don't error out because SensorEventConnection::dump overloads BBinder::dumpBernhard Rosenkränzer2014-11-251-0/+7
* | | | | am 22b99e3a: am 45aa0227: Merge "Fix potential format string vulnerability"chh2014-11-251-6/+3
|\ \ \ \ \ | |/ / / /
| * | | | am 45aa0227: Merge "Fix potential format string vulnerability"chh2014-11-251-6/+3
| |\ \ \ \ | | |/ / /
| | * | | Fix potential format string vulnerabilityBernhard Rosenkränzer2014-11-241-6/+3
* | | | | am 1e611662: am b947f29a: Merge "Add clamp to Layer and update Transform inve...Michael Lentine2014-11-252-17/+29
|\ \ \ \ \ | |/ / / /
| * | | | am b947f29a: Merge "Add clamp to Layer and update Transform inverse." into lm...Michael Lentine2014-11-252-17/+29
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add clamp to Layer and update Transform inverse.Michael Lentine2014-11-212-17/+29
| * | | | am c894c204: Merge "C++11 compatibility."Dan Albert2014-11-201-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | C++11 compatibility.Dan Albert2014-11-201-2/+2
* | | | | am 686c5be4: am 6b9454d1: SurfaceFlinger: Do less work when using PTSDan Stoza2014-11-185-24/+90
|\ \ \ \ \ | |/ / / /
| * | | | am 6b9454d1: SurfaceFlinger: Do less work when using PTSDan Stoza2014-11-185-24/+90
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | SurfaceFlinger: Do less work when using PTSDan Stoza2014-11-175-24/+90
* | | | | am accddd9c: am 947a6adf: Merge "Remove comparisons that can\'t be true"Chih-hung Hsieh2014-11-181-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 947a6adf: Merge "Remove comparisons that can\'t be true"Chih-hung Hsieh2014-11-181-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Remove comparisons that can't be trueBernhard Rosenkränzer2014-11-171-2/+2
| * | | | am 55f71bc0: Merge "Replace IInterface::asBinder() with a static"Marco Nelissen2014-11-173-15/+13
| |\ \ \ \ | | |/ / /