summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-1117-57/+72
|\
| * Make frameworks/av 64-bit compatibleKévin PETIT2014-02-1117-58/+73
* | Merge "Fix clang warnings in AudioFlinger"Glenn Kasten2014-02-107-25/+28
|\ \
| * | Fix clang warnings in AudioFlingerGlenn Kasten2014-02-107-25/+28
* | | am 5a458ede: am 5930e8eb: Merge "AudioFlinger: Remove code for supporting res...Glenn Kasten2014-02-104-26/+5
|\ \ \ | | |/ | |/|
| * | Merge "AudioFlinger: Remove code for supporting resampling in fast tracks"Glenn Kasten2014-02-104-26/+5
| |\ \
| | * | AudioFlinger: Remove code for supporting resampling in fast tracksMartin Storsjo2014-02-054-26/+5
* | | | am 4e12dade: am 4361749d: Merge "AudioTrack: Never try to use the fast path i...Glenn Kasten2014-02-102-5/+0
|\ \ \ \ | |/ / /
| * | | Merge "AudioTrack: Never try to use the fast path if resampling is required"Glenn Kasten2014-02-102-5/+0
| |\ \ \ | | |/ /
| | * | AudioTrack: Never try to use the fast path if resampling is requiredMartin Storsjo2014-01-312-5/+0
* | | | Merge "Pretty up audioflinger dumpsys"Marco Nelissen2014-02-108-190/+374
|\ \ \ \ | |_|_|/ |/| | |
| * | | Pretty up audioflinger dumpsysMarco Nelissen2014-02-108-190/+374
* | | | Merge "Use printf format %#x for audio_format_t in logs"Glenn Kasten2014-02-102-12/+12
|\ \ \ \
| * | | | Use printf format %#x for audio_format_t in logsGlenn Kasten2014-02-072-12/+12
* | | | | Merge "Fix whitespace"Glenn Kasten2014-02-074-18/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix whitespaceGlenn Kasten2014-02-074-18/+19
* | | | | Merge "Use Format_isValid() and Format_isEqual() instead of direct comparison"Glenn Kasten2014-02-073-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use Format_isValid() and Format_isEqual() instead of direct comparisonGlenn Kasten2014-02-033-3/+3
* | | | | Merge "AudioFlinger: Offload track transition fix"Eric Laurent2014-02-072-5/+21
|\ \ \ \ \
| * | | | | AudioFlinger: Offload track transition fixHaynes Mathew George2014-02-062-5/+21
* | | | | | Merge "AudioFlinger: Modify flush handling for offload path"Eric Laurent2014-02-074-15/+31
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AudioFlinger: Modify flush handling for offload pathHaynes Mathew George2014-02-064-15/+31
* | | | | | Merge "audioflinger: OffloadThread state fix"Eric Laurent2014-02-071-3/+2
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | audioflinger: OffloadThread state fixHaynes Mathew George2014-02-061-3/+2
* | | | | Merge "Fix IoConfigEvent constructor initializer list"Glenn Kasten2014-02-071-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix IoConfigEvent constructor initializer listGlenn Kasten2014-02-031-1/+1
* | | | | 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
|\ \ \ \ \ | |/ / / /