summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add multiple format capability to AudioMixer"Andy Hung2014-05-273-30/+217
|\
| * Add multiple format capability to AudioMixerAndy Hung2014-05-233-30/+217
* | Merge "audioflinger: fix deadlock upon AudioRecord creation error"Eric Laurent2014-05-271-5/+18
|\ \
| * | audioflinger: fix deadlock upon AudioRecord creation errorEric Laurent2014-05-261-5/+18
* | | Merge "Move validation of frameCount from set to openRecord_l"Glenn Kasten2014-05-271-0/+1
|\ \ \ | |/ / |/| |
| * | Move validation of frameCount from set to openRecord_lGlenn Kasten2014-05-221-0/+1
* | | Merge "Add format parameter to getTrackName() and track_t"Andy Hung2014-05-238-16/+37
|\ \ \ | | |/ | |/|
| * | Add format parameter to getTrackName() and track_tAndy Hung2014-05-198-16/+37
* | | Merge "audio policy: enable use of new AudioPolicyManager"Eric Laurent2014-05-231-3/+0
|\ \ \
| * | | audio policy: enable use of new AudioPolicyManagerEric Laurent2014-05-221-3/+0
* | | | Merge "Allow track buffer "allocation" to be from pipe"Glenn Kasten2014-05-233-6/+27
|\ \ \ \ | | |_|/ | |/| |
| * | | Allow track buffer "allocation" to be from pipeGlenn Kasten2014-05-223-6/+27
* | | | am 79262cfc: am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/ato...Elliott Hughes2014-05-231-1/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
* | | | | audioflinger: test min HAL version instead of currentEric Laurent2014-05-221-1/+1
* | | | | resolved conflicts for merge of f285c91e to masterElliott Hughes2014-05-227-79/+78
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | 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
* | | | Merge "camera2: Update CameraService for HAL1 shim."Ruben Brunk2014-05-225-89/+295
|\ \ \ \
| * | | | camera2: Update CameraService for HAL1 shim.Ruben Brunk2014-05-215-89/+295
* | | | | resolved conflicts for merge of c0bf836f to masterElliott Hughes2014-05-214-13/+11
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | | | | resolved conflicts for merge of b1080917 to masterElliott Hughes2014-05-212-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | Merge "audio policy: split audio policy library"Eric Laurent2014-05-221-4/+33
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | audio policy: split audio policy libraryEric Laurent2014-05-211-4/+33
* | | | | Merge "audio policy: add new audio devices"Eric Laurent2014-05-201-0/+12
|\ \ \ \ \
| * | | | | audio policy: add new audio devicesEric Laurent2014-05-191-0/+12
| |/ / / /
* | | | | Merge "Update AudioMixer::getTrackName to save channelMask"Andy Hung2014-05-202-12/+9
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Update AudioMixer::getTrackName to save channelMaskAndy Hung2014-05-162-12/+9
* | | | | Merge "Use new channel count functions for audio masks"Andy Hung2014-05-194-10/+14
|\ \ \ \ \ | |/ / / /
| * | | | Use new channel count functions for audio masksAndy Hung2014-05-164-10/+14
| |/ / /
* | | | Merge "Pass stereo gains as packed minifloat"Glenn Kasten2014-05-198-44/+57
|\ \ \ \
| * | | | Pass stereo gains as packed minifloatGlenn Kasten2014-05-198-44/+57
| |/ / /
* | | | am be2664da: am 4c9bde7a: am ce473c32: Merge "Codec Offload: Add NULL check a...Eric Laurent2014-05-191-1/+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
* | | Merge "Pull up mFlags and isFastTrack from Track to TrackBase"Glenn Kasten2014-05-145-10/+12
|\ \ \
| * | | Pull up mFlags and isFastTrack from Track to TrackBaseGlenn Kasten2014-05-135-10/+12
* | | | Merge "Explicitly include Configuration.h"Glenn Kasten2014-05-132-0/+3
|\ \ \ \ | |/ / /
| * | | Explicitly include Configuration.hGlenn Kasten2014-05-132-0/+3
* | | | Merge "Fix memory corruption if increaseSamplingN is not called"Glenn Kasten2014-05-131-1/+1
|\ \ \ \ | |/ / /
| * | | Fix memory corruption if increaseSamplingN is not calledGlenn Kasten2014-05-131-1/+1
* | | | AudioFlinger: add specific mutex for client listsEric Laurent2014-05-136-92/+87
* | | | Merge "audiopolicy: refactor audio command threads"Eric Laurent2014-05-122-118/+83
|\ \ \ \