summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new defaultBrian Carlstrom2014-01-301-1/+1
* Merge "Remove warnings in Audio mixer resampler compilation."Andy Hung2014-01-302-7/+27
|\
| * Remove warnings in Audio mixer resampler compilation.Andy Hung2014-01-292-7/+27
* | audioflinger: fix record thread exit pending checkEric Laurent2014-01-291-3/+7
* | Merge commit 'adf3f9b9' into manualmergeGlenn Kasten2014-01-291-5/+7
|\ \
| * \ am d2dc66a2: am 1bf0eecd: Merge "AudioMixer: Remove tracks from enabledTracks...Glenn Kasten2014-01-291-4/+7
| |\ \
| | * \ am 1bf0eecd: Merge "AudioMixer: Remove tracks from enabledTracks after reseti...Glenn Kasten2014-01-291-4/+7
| | |\ \
| | | * \ Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"Glenn Kasten2014-01-291-4/+7
| | | |\ \
| | | | * | AudioMixer: Remove tracks from enabledTracks after reseting outTempGaurav Kumar2014-01-291-4/+7
* | | | | | Merge "Camera: fix focusArea wrong indexing issue"Zhijun He2014-01-291-14/+14
|\ \ \ \ \ \
| * | | | | | Camera: fix focusArea wrong indexing issueZhijun He2014-01-291-14/+14
* | | | | | | resolved conflicts for merge of 2abfe880 to masterNarayan Kamath2014-01-290-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Support for MPEG2 video" into klp-modular-devDongwon Kang2014-01-292-0/+4
| |\ \ \ \ \ \
| | * | | | | | Support for MPEG2 videoChangwan Ryu2014-01-212-0/+4
* | | | | | | | Merge "AudioTrack: fix obtainBuffer timeout calculation"Eric Laurent2014-01-282-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-01-272-2/+2
* | | | | | | | am bb9e396d: am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MO...Colin Cross2014-01-288-10/+10
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to ...Colin Cross2014-01-288-10/+10
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_...Colin Cross2014-01-288-10/+10
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"Colin Cross2014-01-288-10/+10
| | | |\ \ \ \ \
| | | | * | | | | frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-278-10/+10
| | | |/ / / / /
* | | | | | | | camera3: Delete output stream of bi-directional streamZhijun He2014-01-271-3/+7
| |_|_|/ / / / |/| | | | | |
* | | | | | | am 1ae4b6ce: am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when ...Eric Laurent2014-01-271-5/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when we do take a ...Eric Laurent2014-01-271-5/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
| | | |\ \ \ \
| | | | * | | | Only increase the counter when we do take a wakelockJimmy Dalqvist2014-01-221-5/+7
* | | | | | | | am 9f875b27: am 8ba3192f: am d0e7e801: Merge "Do partial reads in MemoryLeakT...Eric Laurent2014-01-271-3/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 8ba3192f: am d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil"Eric Laurent2014-01-271-3/+11
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | |
| | * | | | | am d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil"Eric Laurent2014-01-271-3/+11
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Do partial reads in MemoryLeakTrackUtil"Eric Laurent2014-01-271-3/+11
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Do partial reads in MemoryLeakTrackUtilOscar Rydhé2014-01-231-3/+11
| | | |/ / /
* | | | | | Merge "Camera: delete preview callback when preview size is changed"Zhijun He2014-01-271-0/+16
|\ \ \ \ \ \
| * | | | | | Camera: delete preview callback when preview size is changedZhijun He2014-01-241-0/+16
* | | | | | | Merge "Camera3: Flush device before ZSL reprocess"Zhijun He2014-01-272-1/+17
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Camera3: Flush device before ZSL reprocessZhijun He2014-01-232-1/+17
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Remove the redundant parameters from createTrack_l()"Glenn Kasten2014-01-242-69/+42
|\ \ \ \ \ \
| * | | | | | Remove the redundant parameters from createTrack_l()Glenn Kasten2014-01-242-69/+42
* | | | | | | Merge "Refactor code related to I/O handles to reduce chance for leaks"Glenn Kasten2014-01-244-53/+72
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Refactor code related to I/O handles to reduce chance for leaksGlenn Kasten2014-01-244-53/+72
* | | | | | | Merge "Camera: delete zsl stream for video mode"Zhijun He2014-01-241-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Camera: delete zsl stream for video modeZhijun He2013-11-011-0/+2
* | | | | | | Merge "Replace control block frameCount_ by explicit in/out parameter"Glenn Kasten2014-01-2411-29/+49
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Replace control block frameCount_ by explicit in/out parameterGlenn Kasten2013-12-2011-29/+49
* | | | | | | camera3: Update sceneMode tag spec.Ruben Brunk2014-01-172-10/+10
* | | | | | | Merge "Fix build. Missing vendor_tag header."Ruben Brunk2014-01-171-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix build. Missing vendor_tag header.Ruben Brunk2014-01-171-0/+1
* | | | | | | | Merge "Use uint32_t sequence numbers for IAudioRecord"Glenn Kasten2014-01-172-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Use uint32_t sequence numbers for IAudioRecordGlenn Kasten2014-01-162-2/+2
* | | | | | | | | am 4f8bb114: am 1526c2e1: am 96a7b5a9: Merge "Long mp3 metadata displays as c...Marco Nelissen2014-01-173-18/+26
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |