summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-051-1/+2
|\
| * FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-041-1/+2
* | am 5ef74dce: am d66cd743: Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
|\ \
| * | audioflinger: conform inline ASM to UALsynergy dev2014-02-041-2/+2
| * | audioflinger: fix static track end detectionEric Laurent2014-01-301-9/+2
* | | Merge "audioflinger: Fix for a deadlock in track creation"Glenn Kasten2014-02-052-4/+4
|\ \ \
| * | | audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-01-302-4/+4
* | | | Merge "Fix unused parameter warnings in audio"Glenn Kasten2014-02-047-42/+46
|\ \ \ \
| * | | | Fix unused parameter warnings in audioGlenn Kasten2014-02-037-42/+46
| | |_|/ | |/| |
* | | | camera3: Update maxRegions tag.Ruben Brunk2014-02-042-9/+38
* | | | Merge "Fix dynamic resampling for non-NEON devices"Andy Hung2014-02-041-6/+2
|\ \ \ \
| * | | | Fix dynamic resampling for non-NEON devicesAndy Hung2014-02-031-6/+2
| |/ / /
* | | | Enable new dynamic audio resampler as defaultAndy Hung2014-01-302-3/+11
|/ / /
* | | 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
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
* | | | | Camera: fix focusArea wrong indexing issueZhijun He2014-01-291-14/+14
| |_|_|/ |/| | |
* | | | camera3: Delete output stream of bi-directional streamZhijun He2014-01-271-3/+7
* | | | 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 "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-245-11/+16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Replace control block frameCount_ by explicit in/out parameterGlenn Kasten2013-12-205-11/+16
* | | | | camera3: Update sceneMode tag spec.Ruben Brunk2014-01-172-10/+10
* | | | | Merge "Cleanup createTrack error handling"Glenn Kasten2014-01-172-0/+2
|\ \ \ \ \
| * | | | | Cleanup createTrack error handlingGlenn Kasten2014-01-162-0/+2
* | | | | | Merge "AudioRecord::getInputFramesLost() cleanup"Glenn Kasten2014-01-174-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | AudioRecord::getInputFramesLost() cleanupGlenn Kasten2014-01-144-4/+4
* | | | | | am a2949165: am 3eccdde9: am c7614eb7: Merge "libcameraservice: Fix build in ...Eino-Ville Talvala2014-01-151-5/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "libcameraservice: Fix build in ISO C++11 mode"Eino-Ville Talvala2014-01-151-5/+5
| |\ \ \ \ \
| | * | | | | libcameraservice: Fix build in ISO C++11 modeBernhard Rosenkraenzer2013-07-301-5/+5
* | | | | | | Merge "Fix error handling in AudioSystem::getOutputForEffect"Glenn Kasten2014-01-151-1/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix error handling in AudioSystem::getOutputForEffectGlenn Kasten2014-01-091-1/+2
* | | | | | | Merge "Use AUDIO_SESSION_ALLOCATE instead of 0"Glenn Kasten2014-01-151-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Use AUDIO_SESSION_ALLOCATE instead of 0Glenn Kasten2013-12-201-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "Improve dynamic audio resampler filter generation"Andy Hung2014-01-104-90/+586
|\ \ \ \ \ \ \
| * | | | | | | Improve dynamic audio resampler filter generationAndy Hung2014-01-084-90/+586
* | | | | | | | am 0ba9f9b0: am d8d45edf: am 61540b5f: Merge "Frameworks: AudioFlinger: Fix e...Glenn Kasten2014-01-101-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "Frameworks: AudioFlinger: Fix effects memory leak"Glenn Kasten2014-01-101-0/+8
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Frameworks: AudioFlinger: Fix effects memory leakYu Yezhong2013-10-151-0/+8
| * | | | | | audioflinger: check for condition before waitingHaynes Mathew George2013-12-171-1/+6
* | | | | | | audioflinger: update track ready conditionHaynes Mathew George2014-01-081-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge "audioflinger: fix static track end detection"Eric Laurent2014-01-071-9/+2
|\ \ \ \ \ \
| * | | | | | audioflinger: fix static track end detectionEric Laurent2013-12-201-9/+2