summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Remove 64-bit android_atomic uses from StateQueue.Hans Boehm2014-07-232-12/+8
* am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-1/+0
|\
| * Move frameworks/av off <sys/atomics.h>.Elliott Hughes2014-05-221-1/+0
* | am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-227-38/+38
|\ \ | |/
| * Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-227-38/+38
* | am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."Elliott Hughes2014-05-221-1/+1
|\ \ | |/
| * Restore accidentally-removed NULL timeout.Elliott Hughes2014-05-211-1/+1
* | am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-224-8/+8
|\ \ | |/
| * Move frameworks/av off private API.Elliott Hughes2014-05-214-8/+8
* | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-222-4/+4
|\ \ | |/
| * Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-212-4/+4
* | am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL ...Eric Laurent2014-05-191-1/+4
|\ \ | |/
| * Codec Offload: Add NULL check as mCallbackThread is NULLUday Gupta2014-05-131-1/+4
* | am f02f06c4: Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
|\ \ | |/
| * Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| |\
| | * camera: check Intent entry count before reading itYuvraj Pasi2014-05-121-0/+3
* | | am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_...Eric Laurent2014-05-062-10/+27
|\ \ \ | |/ /
| * | Merge "Fix memory leak when filtering commands in insertCommand_l()"Eric Laurent2014-05-062-10/+27
| |\ \
| | * | Fix memory leak when filtering commands in insertCommand_l()Jesper Tragardh2014-04-112-10/+27
| | |/
* | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-297-102/+217
|\ \ \ | |/ / |/| |
| * | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r...Igor Murashkin2014-03-252-44/+121
| |\ \
| | * | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-252-44/+121
| * | | am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| |\ \ \ | | | |/ | | |/|
| * | | resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aospColin Cross2014-03-2120-70/+80
| |\ \ \
| * \ \ \ am 36817364: Merge "Add libaudioresampler"Glenn Kasten2014-03-191-11/+18
| |\ \ \ \
| * \ \ \ \ am 77658a06: Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ am bd3e2e03: camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| * | | | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-143-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ...Zhijun He2014-03-101-0/+16
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | DO NOT MERGE: Camera: delete preview callback when preview size is changedZhijun He2014-03-101-0/+16
| * | | | | | | am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | |\ \ \ \ \ \
| | | * | | | | | DO NOT MERGE: Camera: fix focusArea wrong indexing issueZhijun He2014-03-051-14/+14
| | | * | | | | | DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.Ruben Brunk2014-03-051-6/+8
| | | * | | | | | DO NOT MERGE: camera2/3: Add protection for still capture pathZhijun He2014-03-051-35/+44
| | * | | | | | | Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2014-03-051-7/+7
| * | | | | | | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-03-0717-58/+73
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in fa...Glenn Kasten2014-03-074-26/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ...Glenn Kasten2014-03-072-5/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am d66cd743: Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-03-071-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 281dd4e1: audioflinger: fix static track end detectionEric Laurent2014-03-051-9/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | audioflinger: fix static track end detectionEric Laurent2014-03-051-9/+2
| | * | | | | | | | | | | AudioMixer: Remove tracks from enabledTracks after reseting outTempGaurav Kumar2014-03-051-4/+7
| * | | | | | | | | | | | am 7e92abea: audioflinger: fix offload write buffer offsetEric Laurent2014-03-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | audioflinger: fix offload write buffer offsetEric Laurent2014-03-051-2/+2
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | audioflinger: check for condition before waitingHaynes Mathew George2014-03-041-1/+6
| * | | | | | | | | | | am e0cd1051: audioflinger: update track ready conditionHaynes Mathew George2014-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | audioflinger: update track ready conditionHaynes Mathew George2014-03-041-1/+1
| * | | | | | | | | | | am e010f65e: audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-03-052-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /