summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-065-73/+73
* Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"Steve Block2012-01-054-9/+9
|\
| * Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-044-9/+9
* | Merge "Remove the notion of "active track" from mixer"Glenn Kasten2012-01-053-81/+89
|\ \
| * | Remove the notion of "active track" from mixerGlenn Kasten2011-12-203-81/+89
* | | Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"Glenn Kasten2012-01-054-45/+36
|\ \ \
| * | | Use the standard CC_LIKELY and CC_UNLIKELY macrosGlenn Kasten2012-01-054-45/+36
* | | | resolved conflicts for merge of 1a4b9939 to masterEric Laurent2012-01-044-1/+30
|\ \ \ \ | |_|_|/ |/| | |
| * | | audioflinger: fix clicks on 48kHz audio.Eric Laurent2011-12-224-1/+30
* | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-036-17/+17
| |/ / |/| |
* | | Merge "Remove dead code"Glenn Kasten2011-12-202-5/+4
|\ \ \ | |_|/ |/| |
| * | Remove dead codeGlenn Kasten2011-12-192-6/+4
* | | Merge "audio effects: rename configure command"Eric Laurent2011-12-191-1/+1
|\ \ \
| * | | audio effects: rename configure commandEric Laurent2011-12-191-1/+1
* | | | Merge "Use constants for 2 and 32"Glenn Kasten2011-12-162-8/+8
|\ \ \ \
| * | | | Use constants for 2 and 32Glenn Kasten2011-12-162-8/+8
* | | | | Merge "Extract out audio DSP code to utility library"Glenn Kasten2011-12-164-117/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Extract out audio DSP code to utility libraryGlenn Kasten2011-12-164-117/+10
| | |/ / | |/| |
* | | | Merge "Use switch in AudioMixer::setParameter"Glenn Kasten2011-12-162-36/+49
|\ \ \ \
| * | | | Use switch in AudioMixer::setParameterGlenn Kasten2011-12-162-36/+49
* | | | | deleteTrackName now asserts on bad input parameterGlenn Kasten2011-12-161-17/+16
|/ / / /
* | | | Merge "setActiveTrack and setBufferProvider can't fail"Glenn Kasten2011-12-162-10/+9
|\ \ \ \
| * | | | setActiveTrack and setBufferProvider can't failGlenn Kasten2011-12-152-10/+9
| |/ / /
* | | | Merge "Simplify enable/disable mixing"Glenn Kasten2011-12-163-30/+15
|\ \ \ \
| * | | | Simplify enable/disable mixingGlenn Kasten2011-12-153-30/+15
| |/ / /
* | | | Merge "Improve resistance to leaks for ConfigEvent"Glenn Kasten2011-12-152-8/+7
|\ \ \ \
| * | | | Improve resistance to leaks for ConfigEventGlenn Kasten2011-12-152-8/+7
| |/ / /
* | | | Merge "Use NULL not 0 for pointers"Glenn Kasten2011-12-153-29/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | Use NULL not 0 for pointersGlenn Kasten2011-12-153-29/+29
| |/ /
* | | Merge "Fix indentation and whitespace"Glenn Kasten2011-12-142-54/+53
|\ \ \
| * | | Fix indentation and whitespaceGlenn Kasten2011-12-142-54/+53
| |/ /
* | | Merge "Improve AudioFlinger error logging"Glenn Kasten2011-12-141-3/+8
|\ \ \
| * | | Improve AudioFlinger error loggingGlenn Kasten2011-12-141-3/+8
| |/ /
* | | Merge "AudioMixer uninitialized simple fields"Glenn Kasten2011-12-141-0/+6
|\ \ \
| * | | AudioMixer uninitialized simple fieldsGlenn Kasten2011-12-141-0/+6
| |/ /
* | | Merge "Audio C++ comments"Glenn Kasten2011-12-142-4/+4
|\ \ \
| * | | Audio C++ commentsGlenn Kasten2011-12-142-4/+4
| |/ /
* | | Merge "Use const char correctly in AudioFlinger"Glenn Kasten2011-12-141-3/+3
|\ \ \
| * | | Use const char correctly in AudioFlingerGlenn Kasten2011-12-141-3/+3
| |/ /
* | | Merge "Use units after all times"Glenn Kasten2011-12-141-10/+12
|\ \ \
| * | | Use units after all timesGlenn Kasten2011-12-141-10/+12
| |/ /
* | | Merge "Remove redundant clear()"Glenn Kasten2011-12-141-1/+0
|\ \ \
| * | | Remove redundant clear()Glenn Kasten2011-12-141-1/+0
| |/ /
* | | Fix includesGlenn Kasten2011-12-142-3/+1
|/ /
* | am 5433e25f: am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" ...Eric Laurent2011-12-052-8/+14
|\ \ | |/
| * audioflinger: fix audio skipping over A2DPEric Laurent2011-12-052-8/+14
* | Merge "Add camera focus move callback."Wu-cheng Li2011-11-291-1/+1
|\ \
| * | Add camera focus move callback.Wu-cheng Li2011-11-291-1/+1
* | | am f6422f5f: am 20398fac: Merge "audioflinger: reduce sleep time to avoid und...Eric Laurent2011-11-231-1/+23
|\ \ \ | |/ / |/| / | |/
| * audioflinger: reduce sleep time to avoid underrunEric Laurent2011-11-221-1/+23