summaryrefslogtreecommitdiffstats
path: root/services/audioflinger
Commit message (Expand)AuthorAgeFilesLines
* am ba20a086: am bc167f83: resolved conflicts for merge of 84fb58bd to lmp-mr1...Eric Laurent2015-08-203-7/+22
|\
| * resolved conflicts for merge of 84fb58bd to lmp-mr1-devEric Laurent2015-08-183-7/+22
| |\
| | * am bdb5e497: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into l...Eric Laurent2015-08-183-7/+23
| | |\
| | | * DO NOT MERGE - audio flinger: fix fuzz test crashEric Laurent2015-08-183-7/+23
| | * | am 995599cb: audioflinger: fix duplicating thread output buffers clearEric Laurent2014-11-101-1/+5
| | |\ \ | | | |/
| | | * audioflinger: fix duplicating thread output buffers clearEric Laurent2014-11-101-1/+5
* | | | am 78c02ddb: am cfa5bf04: Merge "make libserviceutility a shared lib" into lm...Chong Zhang2015-01-071-4/+10
|\ \ \ \ | |/ / /
| * | | Merge "make libserviceutility a shared lib" into lmp-mr1-devChong Zhang2015-01-071-4/+10
| |\ \ \
| | * | | make libserviceutility a shared libChong Zhang2015-01-071-4/+10
* | | | | am 6ab33981: am 610255e8: Merge "audioflinger: pause HW A/V sync output when ...Eric Laurent2015-01-072-5/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge "audioflinger: pause HW A/V sync output when AudioTrack underruns" into...Eric Laurent2015-01-072-5/+13
| |\ \ \ \
| | * | | | audioflinger: pause HW A/V sync output when AudioTrack underrunsEric Laurent2014-12-192-5/+13
| | |/ / /
| * | | | DO NOT MERGE - fix memory leak in PatchPanelsoon1.choi2015-01-051-0/+2
| |/ / /
* | | | am 76758100: am 43637c2e: Merge "fix memory leak in PatchPanel"Eric Laurent2015-01-051-0/+2
|\ \ \ \
| * | | | fix memory leak in PatchPanelsoon1.choi2015-01-051-0/+2
* | | | | am d33712d7: am 145cf5d8: Merge "audioflinger: implement pause/resume for dir...Eric Laurent2014-12-173-30/+115
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "audioflinger: implement pause/resume for direct outputs" into lmp-mr1-devEric Laurent2014-12-173-30/+115
| |\ \ \ \
| | * | | | audioflinger: implement pause/resume for direct outputsEric Laurent2014-12-163-30/+115
* | | | | | am 99429b40: am 277c7b8c: Merge "Fix permission check for audio recording" in...Jean-Michel Trivi2014-12-171-7/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix permission check for audio recordingJean-Michel Trivi2014-12-151-7/+0
| |/ / / /
* | | | | am 67c93ad7: am f1b12df3: Merge "Trigger error only when a template is instan...Chih-Hung Hsieh2014-12-121-6/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Trigger error only when a template is instantiated.Chih-Hung Hsieh2014-12-111-6/+3
* | | | | am 6baa8fe7: am 94a92c69: Merge "[audio][audioflinger] Consume all frames whe...Phil Burk2014-12-111-2/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "[audio][audioflinger] Consume all frames when a DirectThread is done."...Phil Burk2014-12-111-2/+7
| |\ \ \ \
| | * | | | [audio][audioflinger] Consume all frames when a DirectThread is done.Phil Burk2014-12-101-2/+7
* | | | | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ...Eric Laurent2014-12-101-1/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | audio policy: add support for custom mixesEric Laurent2014-12-091-1/+7
| |/ / / /
* | | | | am 561f50de: am db995fe3: Merge "Fix getTimestamp if offload thread is not in...Andy Hung2014-12-081-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Fix getTimestamp if offload thread is not initialized.Andy Hung2014-12-031-1/+2
* | | | | am eb05bacc: am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true ...Elliott Hughes2014-12-031-4/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.Elliott Hughes2014-12-021-4/+1
* | | | | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() prototy...Eric Laurent2014-11-262-5/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-252-5/+9
* | | | | am 1a475921: am 223fd5c9: audio: new routing strategies and stream typesEric Laurent2014-11-265-18/+40
|\ \ \ \ \ | |/ / / /
| * | | | audio: new routing strategies and stream typesEric Laurent2014-11-215-18/+40
* | | | | am d48f1b68: am f50db74f: Merge "Fix format conversion in DuplicatingThread" ...Glenn Kasten2014-11-211-8/+8
|\ \ \ \ \ | |/ / / /
| * | | | Fix format conversion in DuplicatingThreadHaynes Mathew George2014-11-201-8/+8
* | | | | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-204-12/+16
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | C++11 compatibility.Dan Albert2014-11-204-12/+16
* | | | | am 9b323821: am e4044209: Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-192-0/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-182-0/+12
| |\ \ \ \
| | * | | | Disable clang++ due to compiler error.Chih-Hung Hsieh2014-11-142-0/+12
* | | | | | am a3e2c146: am 4d0a5985: Merge "Prevent stopped audio tracks from mixing dat...Andy Hung2014-11-181-8/+9
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Prevent stopped audio tracks from mixing dataAndy Hung2014-11-171-8/+9
* | | | | | am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-masterElliott Hughes2014-11-171-7/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-7/+0
* | | | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-172-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-172-2/+2
| | |/ / / | |/| | |
* | | | | am 2f702c9b: am 43e10bb7: Merge "Move to libc++."Dan Albert2014-11-111-14/+3
|\ \ \ \ \ | |/ / / /
| * | | | Move to libc++.Dan Albert2014-11-111-14/+3