Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default | Brian Carlstrom | 2014-01-30 | 1 | -1/+1 |
* | Merge "Remove warnings in Audio mixer resampler compilation." | Andy Hung | 2014-01-30 | 2 | -7/+27 |
|\ | |||||
| * | Remove warnings in Audio mixer resampler compilation. | Andy Hung | 2014-01-29 | 2 | -7/+27 |
* | | audioflinger: fix record thread exit pending check | Eric Laurent | 2014-01-29 | 1 | -3/+7 |
* | | Merge commit 'adf3f9b9' into manualmerge | Glenn Kasten | 2014-01-29 | 1 | -5/+7 |
|\ \ | |||||
| * \ | am d2dc66a2: am 1bf0eecd: Merge "AudioMixer: Remove tracks from enabledTracks... | Glenn Kasten | 2014-01-29 | 1 | -4/+7 |
| |\ \ | |||||
| | * \ | am 1bf0eecd: Merge "AudioMixer: Remove tracks from enabledTracks after reseti... | Glenn Kasten | 2014-01-29 | 1 | -4/+7 |
| | |\ \ | |||||
| | | * \ | Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp" | Glenn Kasten | 2014-01-29 | 1 | -4/+7 |
| | | |\ \ | |||||
| | | | * | | AudioMixer: Remove tracks from enabledTracks after reseting outTemp | Gaurav Kumar | 2014-01-29 | 1 | -4/+7 |
* | | | | | | Merge "Camera: fix focusArea wrong indexing issue" | Zhijun He | 2014-01-29 | 1 | -14/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Camera: fix focusArea wrong indexing issue | Zhijun He | 2014-01-29 | 1 | -14/+14 |
* | | | | | | | resolved conflicts for merge of 2abfe880 to master | Narayan Kamath | 2014-01-29 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge "Support for MPEG2 video" into klp-modular-dev | Dongwon Kang | 2014-01-29 | 2 | -0/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Support for MPEG2 video | Changwan Ryu | 2014-01-21 | 2 | -0/+4 |
* | | | | | | | | Merge "AudioTrack: fix obtainBuffer timeout calculation" | Eric Laurent | 2014-01-28 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | AudioTrack: fix obtainBuffer timeout calculation | Eric Laurent | 2014-01-27 | 2 | -2/+2 |
* | | | | | | | | am bb9e396d: am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MO... | Colin Cross | 2014-01-28 | 8 | -10/+10 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to ... | Colin Cross | 2014-01-28 | 8 | -10/+10 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_... | Colin Cross | 2014-01-28 | 8 | -10/+10 |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | |||||
| | | * | | | | | Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" | Colin Cross | 2014-01-28 | 8 | -10/+10 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH | Colin Cross | 2014-01-27 | 8 | -10/+10 |
| | | |/ / / / / | |||||
* | | | | | | | | camera3: Delete output stream of bi-directional stream | Zhijun He | 2014-01-27 | 1 | -3/+7 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | am 1ae4b6ce: am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when ... | Eric Laurent | 2014-01-27 | 1 | -5/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when we do take a ... | Eric Laurent | 2014-01-27 | 1 | -5/+7 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock" | Eric Laurent | 2014-01-27 | 1 | -5/+7 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge "Only increase the counter when we do take a wakelock" | Eric Laurent | 2014-01-27 | 1 | -5/+7 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Only increase the counter when we do take a wakelock | Jimmy Dalqvist | 2014-01-22 | 1 | -5/+7 |
* | | | | | | | | am 9f875b27: am 8ba3192f: am d0e7e801: Merge "Do partial reads in MemoryLeakT... | Eric Laurent | 2014-01-27 | 1 | -3/+11 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 8ba3192f: am d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil" | Eric Laurent | 2014-01-27 | 1 | -3/+11 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | am d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil" | Eric Laurent | 2014-01-27 | 1 | -3/+11 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge "Do partial reads in MemoryLeakTrackUtil" | Eric Laurent | 2014-01-27 | 1 | -3/+11 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | | * | | | Do partial reads in MemoryLeakTrackUtil | Oscar Rydhé | 2014-01-23 | 1 | -3/+11 |
| | | |/ / / | |||||
* | | | | | | Merge "Camera: delete preview callback when preview size is changed" | Zhijun He | 2014-01-27 | 1 | -0/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Camera: delete preview callback when preview size is changed | Zhijun He | 2014-01-24 | 1 | -0/+16 |
* | | | | | | | Merge "Camera3: Flush device before ZSL reprocess" | Zhijun He | 2014-01-27 | 2 | -1/+17 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Camera3: Flush device before ZSL reprocess | Zhijun He | 2014-01-23 | 2 | -1/+17 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge "Remove the redundant parameters from createTrack_l()" | Glenn Kasten | 2014-01-24 | 2 | -69/+42 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove the redundant parameters from createTrack_l() | Glenn Kasten | 2014-01-24 | 2 | -69/+42 |
* | | | | | | | Merge "Refactor code related to I/O handles to reduce chance for leaks" | Glenn Kasten | 2014-01-24 | 4 | -53/+72 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Refactor code related to I/O handles to reduce chance for leaks | Glenn Kasten | 2014-01-24 | 4 | -53/+72 |
* | | | | | | | Merge "Camera: delete zsl stream for video mode" | Zhijun He | 2014-01-24 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Camera: delete zsl stream for video mode | Zhijun He | 2013-11-01 | 1 | -0/+2 |
* | | | | | | | Merge "Replace control block frameCount_ by explicit in/out parameter" | Glenn Kasten | 2014-01-24 | 11 | -29/+49 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Replace control block frameCount_ by explicit in/out parameter | Glenn Kasten | 2013-12-20 | 11 | -29/+49 |
* | | | | | | | camera3: Update sceneMode tag spec. | Ruben Brunk | 2014-01-17 | 2 | -10/+10 |
* | | | | | | | Merge "Fix build. Missing vendor_tag header." | Ruben Brunk | 2014-01-17 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix build. Missing vendor_tag header. | Ruben Brunk | 2014-01-17 | 1 | -0/+1 |
* | | | | | | | | Merge "Use uint32_t sequence numbers for IAudioRecord" | Glenn Kasten | 2014-01-17 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use uint32_t sequence numbers for IAudioRecord | Glenn Kasten | 2014-01-16 | 2 | -2/+2 |
* | | | | | | | | | am 4f8bb114: am 1526c2e1: am 96a7b5a9: Merge "Long mp3 metadata displays as c... | Marco Nelissen | 2014-01-17 | 3 | -18/+26 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | |